vlib: introduce vlib_get_main_by_index(), vlib_get_n_threads()

[vpp.git] / src / plugins / memif / private.h

diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h
index ad6295e..22b2ab8 100644 (file)
--- a/src/plugins/memif/private.h
+++ b/src/plugins/memif/private.h
@@ -16,6 +16,7 @@
  */
 
 #include <vppinfra/lock.h>
+#include <vlib/log.h>
 
 #define MEMIF_DEFAULT_SOCKET_FILENAME  "memif.sock"
 #define MEMIF_DEFAULT_RING_SIZE 1024
@@ -23,44 +24,60 @@
 #define MEMIF_DEFAULT_TX_QUEUES 1
 #define MEMIF_DEFAULT_BUFFER_SIZE 2048
 
-#define MEMIF_MAX_M2S_RING             (vec_len (vlib_mains) - 1)
-#define MEMIF_MAX_S2M_RING             (vec_len (vlib_mains) - 1)
-#define MEMIF_MAX_REGION               255
+#define MEMIF_MAX_M2S_RING             (vlib_get_n_threads ())
+#define MEMIF_MAX_S2M_RING             256
+#define MEMIF_MAX_REGION               256
 #define MEMIF_MAX_LOG2_RING_SIZE       14
 
-#define MEMIF_DEBUG 0
 
-#if MEMIF_DEBUG == 1
-#define DBG(...) clib_warning(__VA_ARGS__)
-#define DBG_UNIX_LOG(...) clib_unix_warning(__VA_ARGS__)
-#else
-#define DBG(...)
-#define DBG_UNIX_LOG(...)
-#endif
+#define memif_log_debug(dev, f, ...) do {                               \
+  memif_if_t *_dev = (memif_if_t *) dev;                                \
+  if (_dev)                                                             \
+    vlib_log(VLIB_LOG_LEVEL_DEBUG, memif_main.log_class, "%U: " f,      \
+            format_vnet_hw_if_index_name, vnet_get_main(),             \
+            _dev->hw_if_index, ##__VA_ARGS__);                         \
+  else                                                                  \
+    vlib_log(VLIB_LOG_LEVEL_DEBUG, memif_main.log_class, f,             \
+             ##__VA_ARGS__);                                            \
+} while (0)
+
+#define memif_log_warn(dev, f, ...) do {                                \
+  memif_if_t *_dev = (memif_if_t *) dev;                                \
+  if (_dev)                                                             \
+    vlib_log(VLIB_LOG_LEVEL_WARNING, memif_main.log_class, "%U: " f,    \
+            format_vnet_hw_if_index_name, vnet_get_main(),             \
+            _dev->hw_if_index, ##__VA_ARGS__);                         \
+  else                                                                  \
+    vlib_log(VLIB_LOG_LEVEL_WARNING, memif_main.log_class, f,           \
+             ##__VA_ARGS__);                                            \
+} while (0)
+
+#define memif_log_err(dev, f, ...) do {                                 \
+  memif_if_t *_dev = (memif_if_t *) dev;                                \
+  if (_dev)                                                             \
+    vlib_log(VLIB_LOG_LEVEL_ERR, memif_main.log_class, "%U: " f,        \
+            format_vnet_hw_if_index_name, vnet_get_main(),             \
+            _dev->hw_if_index, ##__VA_ARGS__);                         \
+  else                                                                  \
+    vlib_log(VLIB_LOG_LEVEL_ERR, memif_main.log_class, f,               \
+             ##__VA_ARGS__);                                            \
+} while (0)
 
-#if MEMIF_DEBUG == 1
 #define memif_file_add(a, b) do {                                      \
   *a = clib_file_add (&file_main, b);                                  \
-  clib_warning ("clib_file_add fd %d private_data %u idx %u",          \
+  memif_log_warn (0, "clib_file_add fd %d private_data %u idx %u",     \
                (b)->file_descriptor, (b)->private_data, *a);           \
 } while (0)
 
 #define memif_file_del(a) do {                                         \
-  clib_warning ("clib_file_del idx %u",a - file_main.file_pool);       \
+  memif_log_warn (0, "clib_file_del idx %u", a - file_main.file_pool); \
   clib_file_del (&file_main, a);                                       \
 } while (0)
 
 #define memif_file_del_by_index(a) do {                                        \
-  clib_warning ("clib_file_del idx %u", a);                            \
+  memif_log_warn (0, "clib_file_del idx %u", a);                       \
   clib_file_del_by_index (&file_main, a);                              \
 } while (0)
-#else
-#define memif_file_add(a, b) do {                                      \
-  *a = clib_file_add (&file_main, b);                                  \
-} while (0)
-#define memif_file_del(a) clib_file_del(&file_main, a)
-#define memif_file_del_by_index(a) clib_file_del_by_index(&file_main, a)
-#endif
 
 typedef struct
 {
@@ -80,6 +97,8 @@ typedef struct
 
 typedef struct
 {
+  /* Required for vec_validate_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   void *shm;
   memif_region_size_t region_size;
   int fd;
@@ -94,6 +113,7 @@ typedef struct
 
 typedef struct
 {
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   /* ring data */
   memif_ring_t *ring;
   memif_log2_ring_size_t log2_ring_size;
@@ -103,6 +123,7 @@ typedef struct
   u16 last_head;
   u16 last_tail;
   u32 *buffers;
+  u8 buffer_pool_index;
 
   /* interrupts */
   int int_fd;
@@ -111,6 +132,7 @@ typedef struct
 
   /* queue type */
   memif_ring_type_t type;
+  u32 queue_index;
 } memif_queue_t;
 
 #define foreach_memif_if_flag \
@@ -186,6 +208,7 @@ typedef struct
 
 typedef struct
 {
+  CLIB_ALIGN_MARK (pad, 16);   /* align up to 16 bytes for 32bit builds */
   void *data;
   u32 data_len;
   i16 buffer_offset;
@@ -203,9 +226,9 @@ typedef struct
   memif_copy_op_t *copy_ops;
   u32 *buffers;
 
+  memif_desc_t desc_template;
   /* buffer template */
   vlib_buffer_t buffer_template;
-  memif_desc_t desc_template;
 } memif_per_thread_data_t;
 
 typedef struct
@@ -225,16 +248,19 @@ typedef struct
   /* per thread data */
   memif_per_thread_data_t *per_thread_data;
 
+  vlib_log_class_t log_class;
+
 } memif_main_t;
 
 extern memif_main_t memif_main;
 extern vnet_device_class_t memif_device_class;
 extern vlib_node_registration_t memif_input_node;
 
-enum
+typedef enum
 {
   MEMIF_PROCESS_EVENT_START = 1,
   MEMIF_PROCESS_EVENT_STOP = 2,
+  MEMIF_PROCESS_EVENT_ADMIN_UP_DOWN = 3,
 } memif_process_event_t;
 
 typedef struct
@@ -261,6 +287,8 @@ int memif_socket_filename_add_del (u8 is_add, u32 sock_id,
 int memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args);
 int memif_delete_if (vlib_main_t * vm, memif_if_t * mif);
 clib_error_t *memif_plugin_api_hookup (vlib_main_t * vm);
+clib_error_t *memif_interface_admin_up_down (vnet_main_t *vnm, u32 hw_if_index,
+                                            u32 flags);
 
 static_always_inline void *
 memif_get_buffer (memif_if_t * mif, memif_ring_t * ring, u16 slot)
@@ -287,6 +315,7 @@ clib_error_t *memif_msg_send_disconnect (memif_if_t * mif,
                                         clib_error_t * err);
 u8 *format_memif_device_name (u8 * s, va_list * args);
 
+
 /*
  * fd.io coding-style-patch-verification: ON
  *