-/*
+/*
*------------------------------------------------------------------
* tapcli.c - dynamic tap interface hookup
*
* limitations under the License.
*------------------------------------------------------------------
*/
+/**
+ * @file
+ * @brief dynamic tap interface hookup
+ */
#include <fcntl.h> /* for open */
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/types.h>
#include <sys/uio.h> /* for iovec */
#include <netinet/in.h>
static vnet_device_class_t tapcli_dev_class;
static vnet_hw_interface_class_t tapcli_interface_class;
+static vlib_node_registration_t tapcli_rx_node;
static void tapcli_nopunt_frame (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame);
+/**
+ * @brief Struct for the tapcli interface
+ */
typedef struct {
u32 unix_fd;
u32 unix_file_index;
u32 provision_fd;
- u32 sw_if_index; /* for counters */
+ /** For counters */
+ u32 sw_if_index;
u32 hw_if_index;
u32 is_promisc;
struct ifreq ifr;
u32 per_interface_next_index;
- u8 active; /* for delete */
+ /** for delete */
+ u8 active;
} tapcli_interface_t;
+/**
+ * @brief Struct for RX trace
+ */
+typedef struct {
+ u16 sw_if_index;
+} tapcli_rx_trace_t;
+
+/**
+ * @brief Function to format TAP CLI trace
+ *
+ * @param *s - u8 - formatting string
+ * @param *va - va_list
+ *
+ * @return *s - u8 - formatted string
+ *
+ */
+u8 * format_tapcli_rx_trace (u8 * s, va_list * va)
+{
+ CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
+ CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
+ vnet_main_t * vnm = vnet_get_main();
+ tapcli_rx_trace_t * t = va_arg (*va, tapcli_rx_trace_t *);
+ s = format (s, "%U", format_vnet_sw_if_index_name,
+ vnm, t->sw_if_index);
+ return s;
+}
+
+/**
+ * @brief TAPCLI main state struct
+ */
typedef struct {
- /* Vector of iovecs for readv/writev calls. */
+ /** Vector of iovecs for readv/writev calls. */
struct iovec * iovecs;
- /* Vector of VLIB rx buffers to use. We allocate them in blocks
+ /** Vector of VLIB rx buffers to use. We allocate them in blocks
of VLIB_FRAME_SIZE (256). */
u32 * rx_buffers;
- /* tap device destination MAC address. Required, or Linux drops pkts */
+ /** tap device destination MAC address. Required, or Linux drops pkts */
u8 ether_dst_mac[6];
- /* Interface MTU in bytes and # of default sized buffers. */
+ /** Interface MTU in bytes and # of default sized buffers. */
u32 mtu_bytes, mtu_buffers;
- /* Vector of tap interfaces */
+ /** Vector of tap interfaces */
tapcli_interface_t * tapcli_interfaces;
- /* Vector of deleted tap interfaces */
+ /** Vector of deleted tap interfaces */
u32 * tapcli_inactive_interfaces;
- /* Bitmap of tap interfaces with pending reads */
+ /** Bitmap of tap interfaces with pending reads */
uword * pending_read_bitmap;
- /* Hash table to find tapcli interface given hw_if_index */
+ /** Hash table to find tapcli interface given hw_if_index */
uword * tapcli_interface_index_by_sw_if_index;
-
- /* Hash table to find tapcli interface given unix fd */
+
+ /** Hash table to find tapcli interface given unix fd */
uword * tapcli_interface_index_by_unix_fd;
- /* renumbering table */
+ /** renumbering table */
u32 * show_dev_instance_by_real_dev_instance;
- /* 1 => disable CLI */
+ /** 1 => disable CLI */
int is_disabled;
- /* convenience */
+ /** convenience - vlib_main_t */
vlib_main_t * vlib_main;
+ /** convenience - vnet_main_t */
vnet_main_t * vnet_main;
+ /** convenience - unix_main_t */
unix_main_t * unix_main;
} tapcli_main_t;
static tapcli_main_t tapcli_main;
-/*
- * tapcli_tx
- * Output node, writes the buffers comprising the incoming frame
+/**
+ * @brief tapcli TX node function
+ * @node tap-cli-tx
+ *
+ * Output node, writes the buffers comprising the incoming frame
* to the tun/tap device, aka hands them to the Linux kernel stack.
- *
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return n_packets - uword
+ *
*/
static uword
tapcli_tx (vlib_main_t * vm,
/* Use the sup intfc to finesse vlan subifs */
hw = vnet_get_sup_hw_interface (tm->vnet_main, tx_sw_if_index);
tx_sw_if_index = hw->sw_if_index;
-
+
p = hash_get (tm->tapcli_interface_index_by_sw_if_index,
tx_sw_if_index);
if (p == 0)
if (writev (ti->unix_fd, tm->iovecs, vec_len (tm->iovecs)) < l)
clib_unix_warning ("writev");
}
-
- /* interface output path flattens buffer chains */
- vlib_buffer_free_no_next (vm, buffers, n_packets);
-
+
+ vlib_buffer_free(vm, vlib_frame_vector_args(frame), frame->n_vectors);
+
return n_packets;
}
};
enum {
- TAPCLI_RX_NEXT_IP4_INPUT,
- TAPCLI_RX_NEXT_IP6_INPUT,
+ TAPCLI_RX_NEXT_IP4_INPUT,
+ TAPCLI_RX_NEXT_IP6_INPUT,
TAPCLI_RX_NEXT_ETHERNET_INPUT,
TAPCLI_RX_NEXT_DROP,
TAPCLI_RX_N_NEXT,
};
+
+
+/**
+ * @brief Dispatch tapcli RX node function for node tap_cli_rx
+ *
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *ti - tapcli_interface_t
+ *
+ * @return n_packets - uword
+ *
+ */
+static uword tapcli_rx_iface(vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ tapcli_interface_t * ti)
+{
+ tapcli_main_t * tm = &tapcli_main;
+ const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+ u32 n_trace = vlib_get_trace_count (vm, node);
+ u8 set_trace = 0;
+
+ vnet_main_t *vnm;
+ vnet_sw_interface_t * si;
+ u8 admin_down;
+ u32 next = node->cached_next_index;
+ u32 n_left_to_next, next_index;
+ u32 *to_next;
+
+ vnm = vnet_get_main();
+ si = vnet_get_sw_interface (vnm, ti->sw_if_index);
+ admin_down = !(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+ vlib_get_next_frame(vm, node, next, to_next, n_left_to_next);
+
+ while (n_left_to_next) { // Fill at most one vector
+ vlib_buffer_t *b_first, *b, *prev;
+ u32 bi_first, bi;
+ word n_bytes_in_packet;
+ int j, n_bytes_left;
+
+ if (PREDICT_FALSE(vec_len(tm->rx_buffers) < tm->mtu_buffers)) {
+ uword len = vec_len(tm->rx_buffers);
+ _vec_len(tm->rx_buffers) +=
+ vlib_buffer_alloc_from_free_list(vm, &tm->rx_buffers[len],
+ VLIB_FRAME_SIZE - len, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+ if (PREDICT_FALSE(vec_len(tm->rx_buffers) < tm->mtu_buffers)) {
+ vlib_node_increment_counter(vm, tapcli_rx_node.index,
+ TAPCLI_ERROR_BUFFER_ALLOC,
+ tm->mtu_buffers - vec_len(tm->rx_buffers));
+ break;
+ }
+ }
+
+ uword i_rx = vec_len (tm->rx_buffers) - 1;
+
+ /* Allocate RX buffers from end of rx_buffers.
+ Turn them into iovecs to pass to readv. */
+ vec_validate (tm->iovecs, tm->mtu_buffers - 1);
+ for (j = 0; j < tm->mtu_buffers; j++) {
+ b = vlib_get_buffer (vm, tm->rx_buffers[i_rx - j]);
+ tm->iovecs[j].iov_base = b->data;
+ tm->iovecs[j].iov_len = buffer_size;
+ }
+
+ n_bytes_left = readv (ti->unix_fd, tm->iovecs, tm->mtu_buffers);
+ n_bytes_in_packet = n_bytes_left;
+ if (n_bytes_left <= 0) {
+ if (errno != EAGAIN) {
+ vlib_node_increment_counter(vm, tapcli_rx_node.index,
+ TAPCLI_ERROR_READ, 1);
+ }
+ break;
+ }
+
+ bi_first = tm->rx_buffers[i_rx];
+ b = b_first = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
+ prev = NULL;
+
+ while (1) {
+ b->current_length = n_bytes_left < buffer_size ? n_bytes_left : buffer_size;
+ n_bytes_left -= buffer_size;
+
+ if (prev) {
+ prev->next_buffer = bi;
+ prev->flags |= VLIB_BUFFER_NEXT_PRESENT;
+ }
+ prev = b;
+
+ /* last segment */
+ if (n_bytes_left <= 0)
+ break;
+
+ i_rx--;
+ bi = tm->rx_buffers[i_rx];
+ b = vlib_get_buffer (vm, bi);
+ }
+
+ _vec_len (tm->rx_buffers) = i_rx;
+
+ b_first->total_length_not_including_first_buffer =
+ (n_bytes_in_packet > buffer_size) ? n_bytes_in_packet - buffer_size : 0;
+ b_first->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+ /* Ensure mbufs are updated */
+ vlib_buffer_chain_validate(vm, b_first);
+
+ VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b_first);
+
+ vnet_buffer (b_first)->sw_if_index[VLIB_RX] = ti->sw_if_index;
+ vnet_buffer (b_first)->sw_if_index[VLIB_TX] = (u32)~0;
+
+ b_first->error = node->errors[TAPCLI_ERROR_NONE];
+ next_index = TAPCLI_RX_NEXT_ETHERNET_INPUT;
+ next_index = (ti->per_interface_next_index != ~0) ?
+ ti->per_interface_next_index : next_index;
+ next_index = admin_down ? TAPCLI_RX_NEXT_DROP : next_index;
+
+ to_next[0] = bi_first;
+ to_next++;
+ n_left_to_next--;
+
+ vlib_validate_buffer_enqueue_x1 (vm, node, next,
+ to_next, n_left_to_next,
+ bi_first, next_index);
+
+ /* Interface counters for tapcli interface. */
+ if (PREDICT_TRUE(!admin_down)) {
+ vlib_increment_combined_counter (
+ vnet_main.interface_main.combined_sw_if_counters
+ + VNET_INTERFACE_COUNTER_RX,
+ os_get_cpu_number(), ti->sw_if_index,
+ 1, n_bytes_in_packet);
+
+ if (PREDICT_FALSE(n_trace > 0)) {
+ vlib_trace_buffer (vm, node, next_index,
+ b_first, /* follow_chain */ 1);
+ n_trace--;
+ set_trace = 1;
+ tapcli_rx_trace_t *t0 = vlib_add_trace (vm, node, b_first, sizeof (*t0));
+ t0->sw_if_index = si->sw_if_index;
+ }
+ }
+ }
+ vlib_put_next_frame (vm, node, next, n_left_to_next);
+ if (set_trace)
+ vlib_set_trace_count (vm, node, n_trace);
+ return VLIB_FRAME_SIZE - n_left_to_next;
+}
+
+/**
+ * @brief tapcli RX node function
+ * @node tap-cli-rx
+ *
+ * Input node from the Kernel tun/tap device
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ * @return n_packets - uword
+ *
+ */
static uword
tapcli_rx (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
tapcli_main_t * tm = &tapcli_main;
- vlib_buffer_t * b;
- u32 bi;
-#if DPDK == 0
- const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
- u32 free_list_index = VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX;
-#else
- dpdk_main_t * dm = &dpdk_main;
- const uword buffer_size = MBUF_SIZE;
- u32 free_list_index = dm->vlib_buffer_free_list_index;
-#endif
static u32 * ready_interface_indices;
tapcli_interface_t * ti;
int i;
+ u32 total_count = 0;
vec_reset_length (ready_interface_indices);
-
- clib_bitmap_foreach (i, tm->pending_read_bitmap,
+ clib_bitmap_foreach (i, tm->pending_read_bitmap,
({
vec_add1 (ready_interface_indices, i);
}));
if (vec_len (ready_interface_indices) == 0)
- return 1;
+ return 0;
for (i = 0; i < vec_len(ready_interface_indices); i++)
- {
- /* Clear the "interrupt" bit */
- tm->pending_read_bitmap =
+ {
+ tm->pending_read_bitmap =
clib_bitmap_set (tm->pending_read_bitmap,
ready_interface_indices[i], 0);
-
- ti = vec_elt_at_index (tm->tapcli_interfaces, ready_interface_indices[i]);
-
- /* Make sure we have some RX buffers. */
- {
- uword n_left = vec_len (tm->rx_buffers);
- uword n_alloc;
-
- if (n_left < VLIB_FRAME_SIZE / 2)
- {
- if (! tm->rx_buffers)
- vec_alloc (tm->rx_buffers, VLIB_FRAME_SIZE);
-
- n_alloc = vlib_buffer_alloc_from_free_list
- (vm, tm->rx_buffers + n_left, VLIB_FRAME_SIZE - n_left,
- free_list_index);
- _vec_len (tm->rx_buffers) = n_left + n_alloc;
- }
- }
-
- /* Allocate RX buffers from end of rx_buffers.
- Turn them into iovecs to pass to readv. */
- {
- uword i_rx = vec_len (tm->rx_buffers) - 1;
- vlib_buffer_t * b;
- word j, n_bytes_left, n_bytes_in_packet;
-#if DPDK == 1
- u8 out_of_dpdk_buffers = 0;
-#endif
-
- /* We need enough buffers left for an MTU sized packet. */
- if (PREDICT_FALSE(vec_len (tm->rx_buffers) < tm->mtu_buffers))
- {
- clib_bitmap_set (tm->pending_read_bitmap,
- ready_interface_indices[i], 1);
- clib_warning ("buffer allocation failure");
- continue;
- }
-
- vec_validate (tm->iovecs, tm->mtu_buffers - 1);
- for (j = 0; j < tm->mtu_buffers; j++)
- {
- b = vlib_get_buffer (vm, tm->rx_buffers[i_rx - j]);
- tm->iovecs[j].iov_base = b->data;
- tm->iovecs[j].iov_len = buffer_size;
- }
-
-#if DPDK == 1
- if (PREDICT_FALSE(out_of_dpdk_buffers == 1))
- continue;
-#endif
-
- n_bytes_left = readv (ti->unix_fd, tm->iovecs, tm->mtu_buffers);
- n_bytes_in_packet = n_bytes_left;
- if (n_bytes_left <= 0)
- {
- if (errno != EAGAIN)
- clib_unix_warning ("readv %d", n_bytes_left);
- return 0;
- }
-
- bi = tm->rx_buffers[i_rx];
- while (1)
- {
- b = vlib_get_buffer (vm, tm->rx_buffers[i_rx]);
-
- b->flags = 0;
- b->current_data = 0;
- b->current_length = n_bytes_left < buffer_size
- ? n_bytes_left : buffer_size;
-
- n_bytes_left -= buffer_size;
-
- if (n_bytes_left <= 0)
- {
-#if DPDK == 1
- struct rte_mbuf *mb = (struct rte_mbuf *)(b - 1);
- rte_pktmbuf_data_len (mb) = n_bytes_in_packet;
- rte_pktmbuf_pkt_len (mb) = n_bytes_in_packet;
-#endif
- break;
- }
-
- i_rx--;
- b->flags |= VLIB_BUFFER_NEXT_PRESENT;
- b->next_buffer = tm->rx_buffers[i_rx];
-#if DPDK == 1
- ASSERT(0); /* $$$$ fixme */
- /* ((struct rte_pktmbuf *)(b->mb))->next =
- vlib_get_buffer (vm, tm->rx_buffers[i_rx])->mb; */
-#endif
- }
-
- /* Interface counters for tapcli interface. */
- vlib_increment_combined_counter
- (vnet_main.interface_main.combined_sw_if_counters
- + VNET_INTERFACE_COUNTER_RX,
- os_get_cpu_number(),
- ti->sw_if_index,
- 1, n_bytes_in_packet);
-
- _vec_len (tm->rx_buffers) = i_rx;
- }
-
- b = vlib_get_buffer (vm, bi);
- /*
- * Turn this on if you run into
- * "bad monkey" contexts, and you want to know exactly
- * which nodes they've visited... See .../vlib/vlib/buffer.h
- */
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT(b);
-
- {
- u32 next_index;
- uword n_trace = vlib_get_trace_count (vm, node);
-
- vnet_buffer (b)->sw_if_index[VLIB_RX] = ti->sw_if_index;
- vnet_buffer (b)->sw_if_index[VLIB_TX] = (u32)~0;
-
- b->error = node->errors[0];
-
- {
- next_index = TAPCLI_RX_NEXT_ETHERNET_INPUT;
-
- next_index = (ti->per_interface_next_index != ~0) ?
- ti->per_interface_next_index : next_index;
- }
- {
- vnet_main_t *vnm = vnet_get_main();
- vnet_sw_interface_t * si;
- si = vnet_get_sw_interface (vnm, ti->sw_if_index);
- if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
- next_index = TAPCLI_RX_NEXT_DROP;
- }
-
-
- vlib_set_next_frame_buffer (vm, node, next_index, bi);
-
- if (n_trace > 0)
- {
- vlib_trace_buffer (vm, node, next_index,
- b, /* follow_chain */ 1);
- vlib_set_trace_count (vm, node, n_trace - 1);
- }
- }
- }
-
- return 1;
+ ti = vec_elt_at_index (tm->tapcli_interfaces, ready_interface_indices[i]);
+ total_count += tapcli_rx_iface(vm, node, ti);
+ }
+ return total_count; //This might return more than 256.
}
+/** TAPCLI error strings */
static char * tapcli_rx_error_strings[] = {
- "Interface down",
+#define _(sym,string) string,
+ foreach_tapcli_error
+#undef _
};
-VLIB_REGISTER_NODE (tapcli_rx_node,static) = {
+VLIB_REGISTER_NODE (tapcli_rx_node, static) = {
.function = tapcli_rx,
.name = "tapcli-rx",
.type = VLIB_NODE_TYPE_INPUT,
.state = VLIB_NODE_STATE_INTERRUPT,
.vector_size = 4,
- .n_errors = 1,
+ .n_errors = TAPCLI_N_ERROR,
.error_strings = tapcli_rx_error_strings,
+ .format_trace = format_tapcli_rx_trace,
.n_next_nodes = TAPCLI_RX_N_NEXT,
.next_nodes = {
},
};
-/* Gets called when file descriptor is ready from epoll. */
+
+/**
+ * @brief Gets called when file descriptor is ready from epoll.
+ *
+ * @param *uf - unix_file_t
+ *
+ * @return error - clib_error_t
+ *
+ */
static clib_error_t * tapcli_read_ready (unix_file_t * uf)
{
vlib_main_t * vm = vlib_get_main();
tapcli_main_t * tm = &tapcli_main;
uword * p;
-
- /* Schedule the rx node */
+
+ /** Schedule the rx node */
vlib_node_set_interrupt_pending (vm, tapcli_rx_node.index);
p = hash_get (tm->tapcli_interface_index_by_unix_fd, uf->file_descriptor);
- /* Mark the specific tap interface ready-to-read */
+ /** Mark the specific tap interface ready-to-read */
if (p)
tm->pending_read_bitmap = clib_bitmap_set (tm->pending_read_bitmap,
p[0], 1);
return 0;
}
+/**
+ * @brief CLI function for TAPCLI configuration
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ *
+ * @return error - clib_error_t
+ *
+ */
static clib_error_t *
tapcli_config (vlib_main_t * vm, unformat_input_t * input)
{
tapcli_main_t *tm = &tapcli_main;
-#if DPDK == 0
- const uword buffer_size = VLIB_BUFFER_DEFAULT_FREE_LIST_BYTES;
-#else
- const uword buffer_size = MBUF_SIZE;
-#endif
+ const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (tm->is_disabled)
return 0;
- if (geteuid())
+ if (geteuid())
{
clib_warning ("tapcli disabled: must be superuser");
tm->is_disabled = 1;
return 0;
- }
+ }
tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
-
+
return 0;
}
+/**
+ * @brief Renumber TAPCLI interface
+ *
+ * @param *hi - vnet_hw_interface_t
+ * @param new_dev_instance - u32
+ *
+ * @return rc - int
+ *
+ */
static int tap_name_renumber (vnet_hw_interface_t * hi,
u32 new_dev_instance)
{
VLIB_CONFIG_FUNCTION (tapcli_config, "tapcli");
+/**
+ * @brief Free "no punt" frame
+ *
+ * @param *vm - vlib_main_t
+ * @param *node - vlib_node_runtime_t
+ * @param *frame - vlib_frame_t
+ *
+ */
static void
tapcli_nopunt_frame (vlib_main_t * vm,
vlib_node_runtime_t * node,
.name = "tapcli",
};
+/**
+ * @brief Formatter for TAPCLI interface name
+ *
+ * @param *s - formatter string
+ * @param *args - va_list
+ *
+ * @return *s - formatted string
+ *
+ */
static u8 * format_tapcli_interface_name (u8 * s, va_list * args)
{
u32 i = va_arg (*args, u32);
return s;
}
-static u32 tapcli_flag_change (vnet_main_t * vnm,
+/**
+ * @brief Modify interface flags for TAPCLI interface
+ *
+ * @param *vnm - vnet_main_t
+ * @param *hw - vnet_hw_interface_t
+ * @param flags - u32
+ *
+ * @return rc - u32
+ *
+ */
+static u32 tapcli_flag_change (vnet_main_t * vnm,
vnet_hw_interface_t * hw,
u32 flags)
{
tapcli_main_t *tm = &tapcli_main;
tapcli_interface_t *ti;
- struct ifreq ifr;
- u32 want_promisc;
- ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
-
- memcpy (&ifr, &ti->ifr, sizeof (ifr));
+ ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
- /* get flags, modify to bring up interface... */
- if (ioctl (ti->provision_fd, SIOCGIFFLAGS, &ifr) < 0)
+ if (flags & ETHERNET_INTERFACE_FLAG_MTU)
{
- clib_unix_warning ("Couldn't get interface flags for %s", hw->name);
- return 0;
+ const uword buffer_size = VLIB_BUFFER_DATA_SIZE;
+ tm->mtu_bytes = hw->max_packet_bytes;
+ tm->mtu_buffers = (tm->mtu_bytes + (buffer_size - 1)) / buffer_size;
}
+ else
+ {
+ struct ifreq ifr;
+ u32 want_promisc;
- want_promisc = (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) != 0;
+ memcpy (&ifr, &ti->ifr, sizeof (ifr));
- if (want_promisc == ti->is_promisc)
- return 0;
+ /* get flags, modify to bring up interface... */
+ if (ioctl (ti->provision_fd, SIOCGIFFLAGS, &ifr) < 0)
+ {
+ clib_unix_warning ("Couldn't get interface flags for %s", hw->name);
+ return 0;
+ }
+ want_promisc = (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) != 0;
- if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
- ifr.ifr_flags |= IFF_PROMISC;
- else
- ifr.ifr_flags &= ~(IFF_PROMISC);
+ if (want_promisc == ti->is_promisc)
+ return 0;
- /* get flags, modify to bring up interface... */
- if (ioctl (ti->provision_fd, SIOCSIFFLAGS, &ifr) < 0)
- {
- clib_unix_warning ("Couldn't set interface flags for %s", hw->name);
- return 0;
- }
+ if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL)
+ ifr.ifr_flags |= IFF_PROMISC;
+ else
+ ifr.ifr_flags &= ~(IFF_PROMISC);
+
+ /* get flags, modify to bring up interface... */
+ if (ioctl (ti->provision_fd, SIOCSIFFLAGS, &ifr) < 0)
+ {
+ clib_unix_warning ("Couldn't set interface flags for %s", hw->name);
+ return 0;
+ }
- ti->is_promisc = want_promisc;
+ ti->is_promisc = want_promisc;
+ }
return 0;
}
-static void tapcli_set_interface_next_node (vnet_main_t *vnm,
+/**
+ * @brief Setting the TAP interface's next processing node
+ *
+ * @param *vnm - vnet_main_t
+ * @param hw_if_index - u32
+ * @param node_index - u32
+ *
+ */
+static void tapcli_set_interface_next_node (vnet_main_t *vnm,
u32 hw_if_index,
u32 node_index)
{
vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
ti = vec_elt_at_index (tm->tapcli_interfaces, hw->dev_instance);
-
- /* Shut off redirection */
+
+ /** Shut off redirection */
if (node_index == ~0)
{
ti->per_interface_next_index = node_index;
return;
}
-
- ti->per_interface_next_index =
+
+ ti->per_interface_next_index =
vlib_node_add_next (tm->vlib_main, tapcli_rx_node.index, node_index);
}
-/*
- * Mainly exists to set link_state == admin_state
- * otherwise, e.g. ip6 neighbor discovery breaks
+/**
+ * @brief Set link_state == admin_state otherwise things like ip6 neighbor discovery breaks
+ *
+ * @param *vnm - vnet_main_t
+ * @param hw_if_index - u32
+ * @param flags - u32
+ *
+ * @return error - clib_error_t
*/
-static clib_error_t *
+static clib_error_t *
tapcli_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
{
uword is_admin_up = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) != 0;
u32 hw_flags;
- u32 speed_duplex = VNET_HW_INTERFACE_FLAG_FULL_DUPLEX
+ u32 speed_duplex = VNET_HW_INTERFACE_FLAG_FULL_DUPLEX
| VNET_HW_INTERFACE_FLAG_SPEED_1G;
-
+
if (is_admin_up)
hw_flags = VNET_HW_INTERFACE_FLAG_LINK_UP | speed_duplex;
else
hw_flags = speed_duplex;
-
+
vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
return 0;
}
.rx_redirect_to_node = tapcli_set_interface_next_node,
.name_renumber = tap_name_renumber,
.admin_up_down_function = tapcli_interface_admin_up_down,
+ .no_flatten_output_chains = 1,
};
+/**
+ * @brief Dump TAP interfaces
+ *
+ * @param **out_tapids - tapcli_interface_details_t
+ *
+ * @return rc - int
+ *
+ */
int vnet_tap_dump_ifs (tapcli_interface_details_t **out_tapids)
{
tapcli_main_t * tm = &tapcli_main;
return 0;
}
-/* get tap interface from inactive interfaces or create new */
+/**
+ * @brief Get tap interface from inactive interfaces or create new
+ *
+ * @return interface - tapcli_interface_t
+ *
+ */
static tapcli_interface_t *tapcli_get_new_tapif()
{
tapcli_main_t * tm = &tapcli_main;
return ti;
}
+/**
+ * @brief Connect a TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *intfc_name - u8
+ * @param *hwaddr_arg - u8
+ * @param *sw_if_index - u32
+ *
+ * @return rc - int
+ *
+ */
int vnet_tap_connect (vlib_main_t * vm, u8 * intfc_name, u8 *hwaddr_arg,
u32 * sw_if_indexp)
{
if ((dev_net_tun_fd = open ("/dev/net/tun", O_RDWR)) < 0)
return VNET_API_ERROR_SYSCALL_ERROR_1;
-
+
memset (&ifr, 0, sizeof (ifr));
strncpy(ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
ifr.ifr_flags = flags;
goto error;
}
- if (ioctl (dev_tap_fd, SIOCGIFHWADDR, &ifr) < 0)
- {
- rv = VNET_API_ERROR_SYSCALL_ERROR_1;
- goto error;
- }
-
ti = tapcli_get_new_tapif();
+ ti->per_interface_next_index = ~0;
if (hwaddr_arg != 0)
- memcpy(hwaddr, hwaddr_arg, 6);
+ clib_memcpy(hwaddr, hwaddr_arg, 6);
+ else
+ {
+ f64 now = vlib_time_now(vm);
+ u32 rnd;
+ rnd = (u32) (now * 1e6);
+ rnd = random_u32 (&rnd);
+
+ memcpy (hwaddr+2, &rnd, sizeof(rnd));
+ hwaddr[0] = 2;
+ hwaddr[1] = 0xfe;
+ }
error = ethernet_register_interface
(tm->vnet_main,
tapcli_dev_class.index,
ti - tm->tapcli_interfaces /* device instance */,
- hwaddr_arg != 0 ? hwaddr :
- (u8 *) ifr.ifr_hwaddr.sa_data /* ethernet address */,
+ hwaddr /* ethernet address */,
&ti->hw_if_index,
tapcli_flag_change);
ti->unix_file_index = unix_file_add (&unix_main, &template);
ti->unix_fd = dev_net_tun_fd;
ti->provision_fd = dev_tap_fd;
- memcpy (&ti->ifr, &ifr, sizeof (ifr));
+ clib_memcpy (&ti->ifr, &ifr, sizeof (ifr));
}
{
vnet_hw_interface_t * hw;
hw = vnet_get_hw_interface (tm->vnet_main, ti->hw_if_index);
+ hw->min_supported_packet_bytes = TAP_MTU_MIN;
+ hw->max_supported_packet_bytes = TAP_MTU_MAX;
+ hw->max_l3_packet_bytes[VLIB_RX] = hw->max_l3_packet_bytes[VLIB_TX] = hw->max_supported_packet_bytes - sizeof(ethernet_header_t);
ti->sw_if_index = hw->sw_if_index;
if (sw_if_indexp)
*sw_if_indexp = hw->sw_if_index;
error:
close (dev_net_tun_fd);
- close (dev_tap_fd);
+ if (dev_tap_fd >= 0)
+ close (dev_tap_fd);
return rv;
}
+/**
+ * @brief Renumber a TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *intfc_name - u8
+ * @param *hwaddr_arg - u8
+ * @param *sw_if_indexp - u32
+ * @param renumber - u8
+ * @param custom_dev_instance - u32
+ *
+ * @return rc - int
+ *
+ */
int vnet_tap_connect_renumber (vlib_main_t * vm, u8 * intfc_name,
u8 *hwaddr_arg, u32 * sw_if_indexp,
u8 renumber, u32 custom_dev_instance)
return rv;
}
+/**
+ * @brief Disconnect TAP CLI interface
+ *
+ * @param *ti - tapcli_interface_t
+ *
+ * @return rc - int
+ *
+ */
static int tapcli_tap_disconnect (tapcli_interface_t *ti)
{
int rv = 0;
return rv;
}
+/**
+ * @brief Delete TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param sw_if_index - u32
+ *
+ * @return rc - int
+ *
+ */
int vnet_tap_delete(vlib_main_t *vm, u32 sw_if_index)
{
int rv = 0;
return rv;
}
+/**
+ * @brief CLI function to delete TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ * @param *cmd - vlib_cli_command_t
+ *
+ * @return error - clib_error_t
+ *
+ */
static clib_error_t *
tap_delete_command_fn (vlib_main_t * vm,
unformat_input_t * input,
.function = tap_delete_command_fn,
};
-/* modifies tap interface - can result in new interface being created */
+/**
+ * @brief Modifies tap interface - can result in new interface being created
+ *
+ * @param *vm - vlib_main_t
+ * @param orig_sw_if_index - u32
+ * @param *intfc_name - u8
+ * @param *hwaddr_arg - u8
+ * @param *sw_if_indexp - u32
+ * @param renumber - u8
+ * @param custom_dev_instance - u32
+ *
+ * @return rc - int
+ *
+ */
int vnet_tap_modify (vlib_main_t * vm, u32 orig_sw_if_index,
u8 * intfc_name, u8 *hwaddr_arg,
u32 * sw_if_indexp,
return rv;
}
+/**
+ * @brief CLI function to modify TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ * @param *cmd - vlib_cli_command_t
+ *
+ * @return error - clib_error_t
+ *
+ */
static clib_error_t *
tap_modify_command_fn (vlib_main_t * vm,
unformat_input_t * input,
u32 new_sw_if_index = ~0;
int user_hwaddr = 0;
u8 hwaddr[6];
-
+
if (tm->is_disabled)
{
return clib_error_return (0, "device disabled...");
else
return clib_error_return (0, "unknown input `%U'",
format_unformat_error, input);
-
+
if (unformat(input, "hwaddr %U", unformat_ethernet_address,
&hwaddr))
user_hwaddr = 1;
VLIB_CLI_COMMAND (tap_modify_command, static) = {
.path = "tap modify",
- .short_help = "tap modify <vpp-tap-intfc-name> <linux-intfc-name> [hwaddr [<addr> | random]]",
+ .short_help = "tap modify <vpp-tap-intfc-name> <linux-intfc-name> [hwaddr <addr>]",
.function = tap_modify_command_fn,
};
+/**
+ * @brief CLI function to connect TAP interface
+ *
+ * @param *vm - vlib_main_t
+ * @param *input - unformat_input_t
+ * @param *cmd - vlib_cli_command_t
+ *
+ * @return error - clib_error_t
+ *
+ */
static clib_error_t *
tap_connect_command_fn (vlib_main_t * vm,
unformat_input_t * input,
{
u8 * intfc_name;
tapcli_main_t * tm = &tapcli_main;
- tapcli_interface_t * ti;
- struct ifreq ifr;
- int flags;
- int dev_net_tun_fd;
- int dev_tap_fd = -1;
- clib_error_t * error;
- int user_hwaddr = 0;
u8 hwaddr[6];
-
+ u8 *hwaddr_arg = 0;
+ u32 sw_if_index;
+
if (tm->is_disabled)
{
return clib_error_return (0, "device disabled...");
if (unformat(input, "hwaddr %U", unformat_ethernet_address,
&hwaddr))
- user_hwaddr = 1;
+ hwaddr_arg = hwaddr;
- flags = IFF_TAP | IFF_NO_PI;
+ /* It is here for backward compatibility */
+ if (unformat(input, "hwaddr random"))
+ ;
- if ((dev_net_tun_fd = open ("/dev/net/tun", O_RDWR)) < 0)
- {
+ int rv = vnet_tap_connect(vm, intfc_name, hwaddr_arg, &sw_if_index);
+ if (rv) {
+ switch (rv) {
+ case VNET_API_ERROR_SYSCALL_ERROR_1:
vlib_cli_output (vm, "Couldn't open /dev/net/tun");
- return 0;
- }
-
- memset (&ifr, 0, sizeof (ifr));
- strncpy(ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
- ifr.ifr_flags = flags;
- if (ioctl (dev_net_tun_fd, TUNSETIFF, (void *)&ifr) < 0)
- {
+ break;
+
+ case VNET_API_ERROR_SYSCALL_ERROR_2:
vlib_cli_output (vm, "Error setting flags on '%s'", intfc_name);
- goto error;
- }
-
- /* Open a provisioning socket */
- if ((dev_tap_fd = socket(PF_PACKET, SOCK_RAW,
- htons(ETH_P_ALL))) < 0 )
- {
+ break;
+
+ case VNET_API_ERROR_SYSCALL_ERROR_3:
vlib_cli_output (vm, "Couldn't open provisioning socket");
- goto error;
- }
-
- /* Find the interface index. */
- {
- struct ifreq ifr;
- struct sockaddr_ll sll;
+ break;
- memset (&ifr, 0, sizeof(ifr));
- strncpy (ifr.ifr_name, (char *) intfc_name, sizeof (ifr.ifr_name)-1);
- if (ioctl (dev_tap_fd, SIOCGIFINDEX, &ifr) < 0 )
- {
- vlib_cli_output (vm, "Couldn't get if_index");
- goto error;
- }
-
- /* Bind the provisioning socket to the interface. */
- memset(&sll, 0, sizeof(sll));
- sll.sll_family = AF_PACKET;
- sll.sll_ifindex = ifr.ifr_ifindex;
- sll.sll_protocol = htons(ETH_P_ALL);
+ case VNET_API_ERROR_SYSCALL_ERROR_4:
+ vlib_cli_output (vm, "Couldn't get if_index");
+ break;
+
+ case VNET_API_ERROR_SYSCALL_ERROR_5:
+ vlib_cli_output (vm, "Couldn't bind provisioning socket");
+ break;
- if (bind(dev_tap_fd, (struct sockaddr*) &sll, sizeof(sll)) < 0)
- {
- vlib_cli_output (vm, "Couldn't bind provisioning socket");
- goto error;
- }
- }
+ case VNET_API_ERROR_SYSCALL_ERROR_6:
+ vlib_cli_output (0, "Couldn't set device non-blocking flag");
+ break;
- /* non-blocking I/O on /dev/tapX */
- {
- int one = 1;
- if (ioctl (dev_net_tun_fd, FIONBIO, &one) < 0)
- {
- vlib_cli_output (0, "Couldn't set device non-blocking flag");
- goto error;
- }
- }
- ifr.ifr_mtu = tm->mtu_bytes;
- if (ioctl (dev_tap_fd, SIOCSIFMTU, &ifr) < 0)
- {
+ case VNET_API_ERROR_SYSCALL_ERROR_7:
vlib_cli_output (0, "Couldn't set device MTU");
- goto error;
- }
+ break;
- /* get flags, modify to bring up interface... */
- if (ioctl (dev_tap_fd, SIOCGIFFLAGS, &ifr) < 0)
- {
+ case VNET_API_ERROR_SYSCALL_ERROR_8:
vlib_cli_output (0, "Couldn't get interface flags");
- goto error;
- }
+ break;
- ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-
- if (ioctl (dev_tap_fd, SIOCSIFFLAGS, &ifr) < 0)
- {
+ case VNET_API_ERROR_SYSCALL_ERROR_9:
vlib_cli_output (0, "Couldn't set intfc admin state up");
- goto error;
- }
-
- if (ioctl (dev_tap_fd, SIOCGIFHWADDR, &ifr) < 0)
- {
- vlib_cli_output (0, "Couldn't get intfc MAC address");
- goto error;
- }
-
- ti = tapcli_get_new_tapif();
- ti->per_interface_next_index = ~0;
-
- if (unformat(input, "hwaddr random"))
- {
- f64 now = vlib_time_now(vm);
- u32 rnd;
- rnd = (u32) (now * 1e6);
- rnd = random_u32 (&rnd);
-
- memcpy (hwaddr+2, &rnd, sizeof(rnd));
- hwaddr[0] = 2;
- hwaddr[1] = 0xfe;
- user_hwaddr = 1;
+ break;
+
+ case VNET_API_ERROR_INVALID_REGISTRATION:
+ vlib_cli_output (0, "Invalid registration");
+ break;
+ default:
+ vlib_cli_output (0, "Unknown error: %d", rv);
+ break;
}
-
- error = ethernet_register_interface
- (tm->vnet_main,
- tapcli_dev_class.index,
- ti - tm->tapcli_interfaces /* device instance */,
- user_hwaddr ? hwaddr :
- (u8 *) ifr.ifr_hwaddr.sa_data /* ethernet address */,
- &ti->hw_if_index,
- tapcli_flag_change);
-
- if (error)
- clib_error_report (error);
-
- {
- unix_file_t template = {0};
- template.read_function = tapcli_read_ready;
- template.file_descriptor = dev_net_tun_fd;
- ti->unix_file_index = unix_file_add (&unix_main, &template);
- ti->unix_fd = dev_net_tun_fd;
- ti->provision_fd = dev_tap_fd;
- memcpy (&ti->ifr, &ifr, sizeof (ifr));
- }
-
- {
- vnet_hw_interface_t * hw;
- hw = vnet_get_hw_interface (tm->vnet_main, ti->hw_if_index);
- ti->sw_if_index = hw->sw_if_index;
+ return 0;
}
- ti->active = 1;
-
- hash_set (tm->tapcli_interface_index_by_sw_if_index, ti->sw_if_index,
- ti - tm->tapcli_interfaces);
-
- hash_set (tm->tapcli_interface_index_by_unix_fd, ti->unix_fd,
- ti - tm->tapcli_interfaces);
-
- vlib_cli_output (vm, "Created %U for Linux tap '%s'",
- format_vnet_sw_if_index_name, tm->vnet_main,
- ti->sw_if_index, intfc_name);
-
+ vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(), sw_if_index);
return 0;
-
- error:
- close (dev_net_tun_fd);
- close (dev_tap_fd);
-
- return 0;
-}
+ }
VLIB_CLI_COMMAND (tap_connect_command, static) = {
.path = "tap connect",
- .short_help = "tap connect <intfc-name> [hwaddr [<addr> | random]]",
+ .short_help = "tap connect <intfc-name> [hwaddr <addr>]",
.function = tap_connect_command_fn,
};
+/**
+ * @brief TAPCLI main init
+ *
+ * @param *vm - vlib_main_t
+ *
+ * @return error - clib_error_t
+ *
+ */
clib_error_t *
tapcli_init (vlib_main_t * vm)
{
tm->vlib_main = vm;
tm->vnet_main = vnet_get_main();
tm->unix_main = &unix_main;
- tm->mtu_bytes = 4096 + 256;
+ tm->mtu_bytes = TAP_MTU_DEFAULT;
tm->tapcli_interface_index_by_sw_if_index = hash_create (0, sizeof(uword));
tm->tapcli_interface_index_by_unix_fd = hash_create (0, sizeof (uword));
+ tm->rx_buffers = 0;
+ vec_alloc(tm->rx_buffers, VLIB_FRAME_SIZE);
+ vec_reset_length(tm->rx_buffers);
vm->os_punt_frame = tapcli_nopunt_frame;
-
return 0;
}
VLIB_INIT_FUNCTION (tapcli_init);
-
-
Code Review / vpp.git / blobdiff