#include <vlib/vlib.h>
#include <vppinfra/pcap.h>
#include <vnet/l3_types.h>
+#include <vppinfra/lock.h>
struct vnet_main_t;
struct vnet_hw_interface_t;
struct vnet_sw_interface_t;
-struct ip46_address_t;
+union ip46_address_t_;
typedef enum
{
(struct vnet_hw_interface_t * hi,
const u8 * old_address, const u8 * new_address);
+/* Interface add/del additional mac address callback */
+typedef clib_error_t *(vnet_interface_add_del_mac_address_function_t)
+ (struct vnet_hw_interface_t * hi, const u8 * address, u8 is_add);
+
/* Interface set rx mode callback. */
typedef clib_error_t *(vnet_interface_set_rx_mode_function_t)
(struct vnet_main_t * vnm, u32 if_index, u32 queue_id,
{ \
vnet_main_t * vnm = vnet_get_main(); \
_vnet_interface_function_list_elt_t *next; \
- if (vnm->tag##_functions[p]->fp == (void *) &f) \
+ if (vnm->tag##_functions[p]->fp == f) \
{ \
vnm->tag##_functions[p] = \
vnm->tag##_functions[p]->next_interface_function; \
next = vnm->tag##_functions[p]; \
while (next->next_interface_function) \
{ \
- if (next->next_interface_function->fp == (void *) &f) \
+ if (next->next_interface_function->fp == f) \
{ \
next->next_interface_function = \
next->next_interface_function->next_interface_function; \
#define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(f,p) \
_VNET_INTERFACE_FUNCTION_DECL_PRIO(f,sw_interface_admin_up_down, p)
+/**
+ * Tunnel description parameters
+ */
+typedef int (*vnet_dev_class_ip_tunnel_desc_t) (u32 sw_if_index,
+ union ip46_address_t_ * src,
+ union ip46_address_t_ * dst,
+ u8 * is_l2);
+
/* A class of hardware interface devices. */
typedef struct _vnet_device_class
{
/* Format flow offload entry */
format_function_t *format_flow;
+ vnet_dev_class_ip_tunnel_desc_t ip_tun_desc;
+
/* Function to clear hardware counters for device. */
void (*clear_counters) (u32 dev_class_instance);
/* Function to set mac address. */
vnet_interface_set_mac_address_function_t *mac_addr_change_function;
+
+ /* Function to add/delete additional MAC addresses */
+ vnet_interface_add_del_mac_address_function_t *mac_addr_add_del_function;
} vnet_device_class_t;
#ifndef CLIB_MARCH_VARIANT
} \
uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (devclass##_tx_fn)
-/* FIXME to be removed */
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)
-
/**
* Link Type: A description of the protocol of packets on the link.
* On an ethernet link this maps directly into the ethertype. On a GRE tunnel
* @brief a point 2 point interface
*/
VNET_HW_INTERFACE_CLASS_FLAG_P2P = (1 << 0),
+ /**
+ * @brief a non-broadcast multiple access interface
+ */
+ VNET_HW_INTERFACE_CLASS_FLAG_NBMA = (1 << 1),
} vnet_hw_interface_class_flags_t;
/* Layer-2 (e.g. Ethernet) interface class. */
/* Function to call when link MAC changes. */
vnet_interface_set_mac_address_function_t *mac_addr_change_function;
+ /* Function to add/delete additional MAC addresses */
+ vnet_interface_add_del_mac_address_function_t *mac_addr_add_del_function;
+
/* Format function to display interface name. */
format_function_t *format_interface_name;
/* tx checksum offload */
VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD = (1 << 17),
+
+ /* gso */
+ VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO = (1 << 18),
+
+ /* non-broadcast multiple access */
+ VNET_HW_INTERFACE_FLAG_NBMA = (1 << 19),
} vnet_hw_interface_flags_t;
#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT 1
that packets flow over. */
typedef struct vnet_hw_interface_t
{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
/* Interface name. */
u8 *name;
/* device input device_and_queue runtime index */
uword *dq_runtime_index_by_queue;
+ /* numa node that hardware device connects to */
+ u8 numa_node;
+
+ /* trace */
+ i32 n_trace;
+
+ u32 trace_classify_table_index;
} vnet_hw_interface_t;
extern vnet_device_class_t vnet_local_interface_device_class;
/* Interface is disabled for forwarding: punt all traffic to slow-path. */
VNET_SW_INTERFACE_FLAG_PUNT = (1 << 1),
- VNET_SW_INTERFACE_FLAG_PROXY_ARP = (1 << 2),
+ __VNET_SW_INTERFACE_FLAG_UNSUED = (1 << 2),
VNET_SW_INTERFACE_FLAG_UNNUMBERED = (1 << 3),
- VNET_SW_INTERFACE_FLAG_BOND_SLAVE = (1 << 4),
+ __VNET_SW_INTERFACE_FLAG_UNUSED2 = (1 << 4),
/* Interface does not appear in CLI/API */
VNET_SW_INTERFACE_FLAG_HIDDEN = (1 << 5),
_(RX_MULTICAST, rx-multicast, if) \
_(RX_BROADCAST, rx-broadcast, if) \
_(TX, tx, if) \
- _(TX_UNICAST, tx-unicast-miss, if) \
+ _(TX_UNICAST, tx-unicast, if) \
_(TX_MULTICAST, tx-multicast, if) \
_(TX_BROADCAST, tx-broadcast, if)
u32 tx_node_index;
} vnet_hw_interface_nodes_t;
+typedef struct
+{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+ u32 *split_buffers;
+} vnet_interface_per_thread_data_t;
+
+typedef u8 *(*vnet_buffer_opquae_formatter_t) (const vlib_buffer_t * b,
+ u8 * s);
+
typedef struct
{
/* Hardware interfaces. */
/* Software interface counters both simple and combined
packet and byte counters. */
- volatile u32 *sw_if_counter_lock;
+ clib_spinlock_t sw_if_counter_lock;
vlib_simple_counter_main_t *sw_if_counters;
vlib_combined_counter_main_t *combined_sw_if_counters;
vnet_hw_interface_nodes_t *deleted_hw_interface_nodes;
- /* pcap drop tracing */
- int drop_pcap_enable;
- pcap_main_t pcap_main;
- u8 *pcap_filename;
- u32 pcap_sw_if_index;
- u32 pcap_pkts_to_capture;
+ /*
+ * pcap drop tracing
+ * Only the drop filter hash lives here. See ../src/vlib/main.h for
+ * the rest of the variables.
+ */
uword *pcap_drop_filter_hash;
+ /* Buffer metadata format helper functions */
+ vnet_buffer_opquae_formatter_t *buffer_opaque_format_helpers;
+ vnet_buffer_opquae_formatter_t *buffer_opaque2_format_helpers;
+
+ /* per-thread data */
+ vnet_interface_per_thread_data_t *per_thread_data;
+
/* feature_arc_index */
u8 output_feature_arc_index;
} vnet_interface_main_t;
vnet_interface_counter_lock (vnet_interface_main_t * im)
{
if (im->sw_if_counter_lock)
- while (clib_atomic_test_and_set (im->sw_if_counter_lock))
- /* zzzz */ ;
+ clib_spinlock_lock (&im->sw_if_counter_lock);
}
static inline void
vnet_interface_counter_unlock (vnet_interface_main_t * im)
{
if (im->sw_if_counter_lock)
- clib_atomic_release (im->sw_if_counter_lock);
+ clib_spinlock_unlock (&im->sw_if_counter_lock);
}
void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add);
vlib_node_runtime_t * node,
vlib_frame_t * frame);
+void vnet_register_format_buffer_opaque_helper
+ (vnet_buffer_opquae_formatter_t fn);
+
+void vnet_register_format_buffer_opaque2_helper
+ (vnet_buffer_opquae_formatter_t fn);
+
+typedef struct
+{
+ u8 *filename;
+ int enable;
+ int status;
+ u32 packets_to_capture;
+ u32 max_bytes_per_pkt;
+ u8 rx_enable;
+ u8 tx_enable;
+ u8 drop_enable;
+ u32 sw_if_index;
+ int filter;
+} vnet_pcap_dispatch_trace_args_t;
+
+int vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t *);
+
#endif /* included_vnet_interface_h */
/*