Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: remove unused function parameter
[vpp.git]
/
src
/
vnet
/
interface.h
diff --git
a/src/vnet/interface.h
b/src/vnet/interface.h
index
5c41859
..
e6418f9
100644
(file)
--- a/
src/vnet/interface.h
+++ b/
src/vnet/interface.h
@@
-43,11
+43,12
@@
#include <vlib/vlib.h>
#include <vppinfra/pcap.h>
#include <vnet/l3_types.h>
#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 vnet_main_t;
struct vnet_hw_interface_t;
struct vnet_sw_interface_t;
-
struct ip46_address_t
;
+
union ip46_address_t_
;
typedef enum
{
typedef enum
{
@@
-131,7
+132,7
@@
static void __vnet_interface_function_deinit_##tag##_##f (void) \
{ \
vnet_main_t * vnm = vnet_get_main(); \
_vnet_interface_function_list_elt_t *next; \
{ \
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; \
{ \
vnm->tag##_functions[p] = \
vnm->tag##_functions[p]->next_interface_function; \
@@
-140,7
+141,7
@@
static void __vnet_interface_function_deinit_##tag##_##f (void) \
next = vnm->tag##_functions[p]; \
while (next->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; \
{ \
next->next_interface_function = \
next->next_interface_function->next_interface_function; \
@@
-174,6
+175,14
@@
static __clib_unused void * __clib_unused_##f = f;
#define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(f,p) \
_VNET_INTERFACE_FUNCTION_DECL_PRIO(f,sw_interface_admin_up_down, p)
#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
{
/* A class of hardware interface devices. */
typedef struct _vnet_device_class
{
@@
-235,6
+244,8
@@
typedef struct _vnet_device_class
/* Format flow offload entry */
format_function_t *format_flow;
/* 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 clear hardware counters for device. */
void (*clear_counters) (u32 dev_class_instance);
@@
-302,9
+313,6
@@
CLIB_MARCH_SFX (devclass##_tx_fn_multiarch_register) (void) \
} \
uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (devclass##_tx_fn)
} \
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
/**
* 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
@@
-568,6
+576,10
@@
typedef struct vnet_hw_interface_t
/* device input device_and_queue runtime index */
uword *dq_runtime_index_by_queue;
/* device input device_and_queue runtime index */
uword *dq_runtime_index_by_queue;
+ /* numa node that hardware device connects to */
+ u8 numa_node;
+
+ u8 padding[3];
} 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;
@@
-660,11
+672,11
@@
typedef enum vnet_sw_interface_flags_t_
/* Interface is disabled for forwarding: punt all traffic to slow-path. */
VNET_SW_INTERFACE_FLAG_PUNT = (1 << 1),
/* 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_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),
/* Interface does not appear in CLI/API */
VNET_SW_INTERFACE_FLAG_HIDDEN = (1 << 5),
@@
-764,7
+776,7
@@
typedef enum
_(RX_MULTICAST, rx-multicast, if) \
_(RX_BROADCAST, rx-broadcast, if) \
_(TX, tx, if) \
_(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)
_(TX_MULTICAST, tx-multicast, if) \
_(TX_BROADCAST, tx-broadcast, if)
@@
-794,10
+806,13
@@
typedef struct
typedef struct
{
typedef struct
{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
u32 *split_buffers;
u32 *split_buffers;
- u32 padding[14];
} vnet_interface_per_thread_data_t;
} vnet_interface_per_thread_data_t;
+typedef u8 *(*vnet_buffer_opquae_formatter_t) (const vlib_buffer_t * b,
+ u8 * s);
+
typedef struct
{
/* Hardware interfaces. */
typedef struct
{
/* Hardware interfaces. */
@@
-822,7
+837,7
@@
typedef struct
/* Software interface counters both simple and combined
packet and byte counters. */
/* 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;
vlib_simple_counter_main_t *sw_if_counters;
vlib_combined_counter_main_t *combined_sw_if_counters;
@@
-836,6
+851,10
@@
typedef struct
u32 pcap_pkts_to_capture;
uword *pcap_drop_filter_hash;
u32 pcap_pkts_to_capture;
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;
/* per-thread data */
vnet_interface_per_thread_data_t *per_thread_data;
@@
-850,15
+869,14
@@
static inline void
vnet_interface_counter_lock (vnet_interface_main_t * im)
{
if (im->sw_if_counter_lock)
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)
}
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);
}
void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add);
@@
-869,6
+887,12
@@
uword vnet_interface_output_node (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame);
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);
+
#endif /* included_vnet_interface_h */
/*
#endif /* included_vnet_interface_h */
/*