Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
lisp: fix lisp/one enable/disable
[vpp.git]
/
src
/
vnet
/
interface.h
diff --git
a/src/vnet/interface.h
b/src/vnet/interface.h
index
e6418f9
..
5f4fd06
100644
(file)
--- a/
src/vnet/interface.h
+++ b/
src/vnet/interface.h
@@
-74,6
+74,10
@@
typedef clib_error_t *(vnet_interface_set_mac_address_function_t)
(struct vnet_hw_interface_t * hi,
const u8 * old_address, const u8 * new_address);
(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,
/* 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,
@@
-266,6
+270,9
@@
typedef struct _vnet_device_class
/* Function to set mac address. */
vnet_interface_set_mac_address_function_t *mac_addr_change_function;
/* 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
} vnet_device_class_t;
#ifndef CLIB_MARCH_VARIANT
@@
-366,6
+373,10
@@
typedef enum vnet_hw_interface_class_flags_t_
* @brief a point 2 point interface
*/
VNET_HW_INTERFACE_CLASS_FLAG_P2P = (1 << 0),
* @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. */
} vnet_hw_interface_class_flags_t;
/* Layer-2 (e.g. Ethernet) interface class. */
@@
-392,6
+403,9
@@
typedef struct _vnet_hw_interface_class
/* Function to call when link MAC changes. */
vnet_interface_set_mac_address_function_t *mac_addr_change_function;
/* 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;
/* Format function to display interface name. */
format_function_t *format_interface_name;
@@
-486,6
+500,12
@@
typedef enum vnet_hw_interface_flags_t_
/* gso */
VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO = (1 << 18),
/* gso */
VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO = (1 << 18),
+
+ /* non-broadcast multiple access */
+ VNET_HW_INTERFACE_FLAG_NBMA = (1 << 19),
+
+ /* hw/driver can switch between l2-promisc and l3-dmac-filter modes */
+ VNET_HW_INTERFACE_FLAG_SUPPORTS_MAC_FILTER = (1 << 20),
} vnet_hw_interface_flags_t;
#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT 1
} vnet_hw_interface_flags_t;
#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT 1
@@
-498,6
+518,7
@@
typedef enum vnet_hw_interface_flags_t_
that packets flow over. */
typedef struct vnet_hw_interface_t
{
that packets flow over. */
typedef struct vnet_hw_interface_t
{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
/* Interface name. */
u8 *name;
/* Interface name. */
u8 *name;
@@
-552,8
+573,9
@@
typedef struct vnet_hw_interface_t
/* Hash table mapping sub interface id to sw_if_index. */
uword *sub_interface_sw_if_index_by_id;
/* Hash table mapping sub interface id to sw_if_index. */
uword *sub_interface_sw_if_index_by_id;
- /* Count of number of L2 subinterfaces */
+ /* Count of number of L2
and L3
subinterfaces */
u32 l2_if_count;
u32 l2_if_count;
+ u32 l3_if_count;
/* Bonded interface info -
0 - not a bonded interface nor a slave
/* Bonded interface info -
0 - not a bonded interface nor a slave
@@
-579,7
+601,10
@@
typedef struct vnet_hw_interface_t
/* numa node that hardware device connects to */
u8 numa_node;
/* numa node that hardware device connects to */
u8 numa_node;
- u8 padding[3];
+ /* trace */
+ i32 n_trace;
+
+ u32 trace_classify_table_index;
} vnet_hw_interface_t;
extern vnet_device_class_t vnet_local_interface_device_class;
} vnet_hw_interface_t;
extern vnet_device_class_t vnet_local_interface_device_class;
@@
-843,12
+868,11
@@
typedef struct
vnet_hw_interface_nodes_t *deleted_hw_interface_nodes;
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 */
uword *pcap_drop_filter_hash;
/* Buffer metadata format helper functions */
@@
-858,9
+882,6
@@
typedef struct
/* per-thread data */
vnet_interface_per_thread_data_t *per_thread_data;
/* per-thread data */
vnet_interface_per_thread_data_t *per_thread_data;
- /* enable GSO processing in packet path if this count is > 0 */
- u32 gso_interface_count;
-
/* feature_arc_index */
u8 output_feature_arc_index;
} vnet_interface_main_t;
/* feature_arc_index */
u8 output_feature_arc_index;
} vnet_interface_main_t;
@@
-893,6
+914,22
@@
void vnet_register_format_buffer_opaque_helper
void vnet_register_format_buffer_opaque2_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 */
/*
#endif /* included_vnet_interface_h */
/*