X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Faf_packet%2Fdevice.c;h=0542b165a3a182e17d79b19e998a9af3508e6a25;hb=7d0e30bc6;hp=a48ae5cf25dd921bd47bc3d4d44120fd20596357;hpb=3eab064e3fadaf2a6a128f167ad04ca0319b4e17;p=vpp.git diff --git a/src/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c index a48ae5cf25d..0542b165a3a 100644 --- a/src/vnet/devices/af_packet/device.c +++ b/src/vnet/devices/af_packet/device.c @@ -23,8 +23,6 @@ #include #include -#include - #include #include #include @@ -52,7 +50,9 @@ static char *af_packet_tx_func_error_strings[] = { #undef _ }; -static u8 * + +#ifndef CLIB_MARCH_VARIANT +u8 * format_af_packet_device_name (u8 * s, va_list * args) { u32 i = va_arg (*args, u32); @@ -62,11 +62,62 @@ format_af_packet_device_name (u8 * s, va_list * args) s = format (s, "host-%s", apif->host_if_name); return s; } +#endif /* CLIB_MARCH_VARIANT */ static u8 * format_af_packet_device (u8 * s, va_list * args) { - s = format (s, "Linux PACKET socket interface"); + u32 dev_instance = va_arg (*args, u32); + u32 indent = format_get_indent (s); + int __clib_unused verbose = va_arg (*args, int); + + af_packet_main_t *apm = &af_packet_main; + af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, dev_instance); + clib_spinlock_lock_if_init (&apif->lockp); + u32 tx_block_sz = apif->tx_req->tp_block_size; + u32 tx_frame_sz = apif->tx_req->tp_frame_size; + u32 tx_frame_nr = apif->tx_req->tp_frame_nr; + u32 tx_block_nr = apif->tx_req->tp_block_nr; + u32 rx_block_size = apif->rx_req->tp_block_size; + u32 rx_frame_size = apif->rx_req->tp_frame_size; + u32 rx_frame_nr = apif->rx_req->tp_frame_nr; + u32 rx_block_nr = apif->rx_req->tp_block_nr; + int block = 0; + u8 *tx_block_start = apif->tx_ring + block * tx_block_sz; + u32 tx_frame = apif->next_tx_frame; + struct tpacket2_hdr *tph; + + s = format (s, "Linux PACKET socket interface\n"); + s = format (s, "%UTX block size:%d nr:%d TX frame size:%d nr:%d\n", + format_white_space, indent, tx_block_sz, tx_block_nr, + tx_frame_sz, tx_frame_nr); + s = format (s, "%URX block size:%d nr:%d RX frame size:%d nr:%d\n", + format_white_space, indent, rx_block_size, rx_block_nr, + rx_frame_size, rx_frame_nr); + s = format (s, "%Unext frame:%d\n", format_white_space, indent, + apif->next_tx_frame); + + int n_send_req = 0, n_avail = 0, n_sending = 0, n_tot = 0, n_wrong = 0; + do + { + tph = (struct tpacket2_hdr *) (tx_block_start + tx_frame * tx_frame_sz); + tx_frame = (tx_frame + 1) % tx_frame_nr; + if (tph->tp_status == 0) + n_avail++; + else if (tph->tp_status & TP_STATUS_SEND_REQUEST) + n_send_req++; + else if (tph->tp_status & TP_STATUS_SENDING) + n_sending++; + else + n_wrong++; + n_tot++; + } + while (tx_frame != apif->next_tx_frame); + s = format (s, "%Uavailable:%d request:%d sending:%d wrong:%d total:%d\n", + format_white_space, indent, n_avail, n_send_req, n_sending, + n_wrong, n_tot); + + clib_spinlock_unlock_if_init (&apif->lockp); return s; } @@ -77,34 +128,18 @@ format_af_packet_tx_trace (u8 * s, va_list * args) return s; } - -static_always_inline void -af_packet_buffer_tx_offload (vlib_buffer_t * b, struct virtio_net_hdr *vhdr) -{ - /* For now - just mark the data as valid, - * DPDK csums on input, tap presently operates in legacy - * compatibility mode where the kernel checksums CSUM_PARTIAL - * for it and we have fixed the af_packet input - * - * In the future, locally originated frames, etc can be made - * to fit this convention so that they are not checksummed - * unless needed. - **/ - vhdr->flags = VIRTIO_NET_HDR_F_DATA_VALID; -} - - -static uword -af_packet_interface_tx (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { af_packet_main_t *apm = &af_packet_main; - u32 *buffers = vlib_frame_args (frame); + u32 *buffers = vlib_frame_vector_args (frame); u32 n_left = frame->n_vectors; u32 n_sent = 0; vnet_interface_output_runtime_t *rd = (void *) node->runtime_data; af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, rd->dev_instance); + clib_spinlock_lock_if_init (&apif->lockp); int block = 0; u32 block_size = apif->tx_req->tp_block_size; u32 frame_size = apif->tx_req->tp_frame_size; @@ -114,25 +149,18 @@ af_packet_interface_tx (vlib_main_t * vm, struct tpacket2_hdr *tph; u32 frame_not_ready = 0; - clib_spinlock_lock_if_init (&apif->lockp); - - while (n_left > 0) + while (n_left) { u32 len; u32 offset = 0; - if (PREDICT_TRUE ((apm->flags & AF_PACKET_USES_VNET_HEADERS) != 0)) - { - offset = sizeof (struct virtio_net_hdr); - } vlib_buffer_t *b0; n_left--; u32 bi = buffers[0]; buffers++; tph = (struct tpacket2_hdr *) (block_start + tx_frame * frame_size); - - if (PREDICT_FALSE - (tph->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING))) + if (PREDICT_FALSE (tph->tp_status & + (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING))) { frame_not_ready++; goto next; @@ -141,16 +169,10 @@ af_packet_interface_tx (vlib_main_t * vm, do { b0 = vlib_get_buffer (vm, bi); - if (PREDICT_TRUE ((apm->flags & AF_PACKET_USES_VNET_HEADERS) != 0)) - { - u8 *vh = - (u8 *) tph + TPACKET_ALIGN (sizeof (struct tpacket2_hdr)); - af_packet_buffer_tx_offload (b0, (struct virtio_net_hdr *) vh); - } len = b0->current_length; - clib_memcpy ((u8 *) tph + - TPACKET_ALIGN (sizeof (struct tpacket2_hdr)) + offset, - vlib_buffer_get_current (b0), len); + clib_memcpy_fast ((u8 *) tph + + TPACKET_ALIGN (sizeof (struct tpacket2_hdr)) + + offset, vlib_buffer_get_current (b0), len); offset += len; } while ((bi = @@ -159,12 +181,13 @@ af_packet_interface_tx (vlib_main_t * vm, tph->tp_len = tph->tp_snaplen = offset; tph->tp_status = TP_STATUS_SEND_REQUEST; n_sent++; + + tx_frame = (tx_frame + 1) % frame_num; + next: /* check if we've exhausted the ring */ if (PREDICT_FALSE (frame_not_ready + n_sent == frame_num)) break; - - tx_frame = (tx_frame + 1) % frame_num; } CLIB_MEMORY_BARRIER (); @@ -173,8 +196,8 @@ af_packet_interface_tx (vlib_main_t * vm, { apif->next_tx_frame = tx_frame; - if (PREDICT_FALSE (sendto (apif->fd, NULL, 0, - MSG_DONTWAIT, NULL, 0) == -1)) + if (PREDICT_FALSE (sendto (apif->fd, NULL, 0, MSG_DONTWAIT, NULL, 0) == + -1)) { /* Uh-oh, drop & move on, but count whether it was fatal or not. * Note that we have no reliable way to properly determine the @@ -182,8 +205,9 @@ af_packet_interface_tx (vlib_main_t * vm, */ vlib_error_count (vm, node->node_index, unix_error_is_fatal (errno) ? - AF_PACKET_TX_ERROR_TXRING_FATAL : - AF_PACKET_TX_ERROR_TXRING_EAGAIN, n_sent); + AF_PACKET_TX_ERROR_TXRING_FATAL : + AF_PACKET_TX_ERROR_TXRING_EAGAIN, + n_sent); } } @@ -197,7 +221,7 @@ af_packet_interface_tx (vlib_main_t * vm, vlib_error_count (vm, node->node_index, AF_PACKET_TX_ERROR_TXRING_OVERRUN, n_left); - vlib_buffer_free (vm, vlib_frame_args (frame), frame->n_vectors); + vlib_buffer_free (vm, vlib_frame_vector_args (frame), frame->n_vectors); return frame->n_vectors; } @@ -242,8 +266,8 @@ af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, if (0 > fd) { - clib_unix_warning ("af_packet_%s could not open socket", - apif->host_if_name); + vlib_log_warn (apm->log_class, "af_packet_%s could not open socket", + apif->host_if_name); return 0; } @@ -255,8 +279,9 @@ af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, ifr.ifr_ifindex = apif->host_if_index; if ((rv = ioctl (fd, SIOCGIFNAME, &ifr)) < 0) { - clib_unix_warning ("af_packet_%s ioctl could not retrieve eth name", - apif->host_if_name); + vlib_log_warn (apm->log_class, + "af_packet_%s ioctl could not retrieve eth name", + apif->host_if_name); goto error; } @@ -264,8 +289,8 @@ af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, if ((rv = ioctl (fd, SIOCGIFFLAGS, &ifr)) < 0) { - clib_unix_warning ("af_packet_%s error: %d", - apif->is_admin_up ? "up" : "down", rv); + vlib_log_warn (apm->log_class, "af_packet_%s error: %d", + apif->is_admin_up ? "up" : "down", rv); goto error; } @@ -282,8 +307,8 @@ af_packet_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, if ((rv = ioctl (fd, SIOCSIFFLAGS, &ifr)) < 0) { - clib_unix_warning ("af_packet_%s error: %d", - apif->is_admin_up ? "up" : "down", rv); + vlib_log_warn (apm->log_class, "af_packet_%s error: %d", + apif->is_admin_up ? "up" : "down", rv); goto error; } @@ -306,7 +331,7 @@ af_packet_subif_add_del_function (vnet_main_t * vnm, } static clib_error_t *af_packet_set_mac_address_function - (struct vnet_hw_interface_t *hi, char *address) + (struct vnet_hw_interface_t *hi, const u8 * old_address, const u8 * address) { af_packet_main_t *apm = &af_packet_main; af_packet_if_t *apif = @@ -316,8 +341,8 @@ static clib_error_t *af_packet_set_mac_address_function if (0 > fd) { - clib_unix_warning ("af_packet_%s could not open socket", - apif->host_if_name); + vlib_log_warn (apm->log_class, "af_packet_%s could not open socket", + apif->host_if_name); return 0; } @@ -329,8 +354,9 @@ static clib_error_t *af_packet_set_mac_address_function ifr.ifr_ifindex = apif->host_if_index; if ((rv = ioctl (fd, SIOCGIFNAME, &ifr)) < 0) { - clib_unix_warning - ("af_packet_%s ioctl could not retrieve eth name, error: %d", + vlib_log_warn + (apm->log_class, + "af_packet_%s ioctl could not retrieve eth name, error: %d", apif->host_if_name, rv); goto error; } @@ -340,8 +366,9 @@ static clib_error_t *af_packet_set_mac_address_function if ((rv = ioctl (fd, SIOCSIFHWADDR, &ifr)) < 0) { - clib_unix_warning ("af_packet_%s ioctl could not set mac, error: %d", - apif->host_if_name, rv); + vlib_log_warn (apm->log_class, + "af_packet_%s ioctl could not set mac, error: %d", + apif->host_if_name, rv); goto error; } @@ -353,10 +380,8 @@ error: return 0; /* no error */ } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (af_packet_device_class) = { .name = "af-packet", - .tx_function = af_packet_interface_tx, .format_device_name = format_af_packet_device_name, .format_device = format_af_packet_device, .format_tx_trace = format_af_packet_tx_trace, @@ -369,10 +394,6 @@ VNET_DEVICE_CLASS (af_packet_device_class) = { .mac_addr_change_function = af_packet_set_mac_address_function, }; -VLIB_DEVICE_TX_FUNCTION_MULTIARCH (af_packet_device_class, - af_packet_interface_tx) -/* *INDENT-ON* */ - /* * fd.io coding-style-patch-verification: ON *