X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Faf_packet%2Faf_packet.c;h=f1a7b6ad21ca0dbb0c6db6cf630590d6f157c816;hb=04e0bb2;hp=91c3988b439cd01340c614aa9f19b7eb2f53a350;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git diff --git a/src/vnet/devices/af_packet/af_packet.c b/src/vnet/devices/af_packet/af_packet.c index 91c3988b439..f1a7b6ad21c 100644 --- a/src/vnet/devices/af_packet/af_packet.c +++ b/src/vnet/devices/af_packet/af_packet.c @@ -19,7 +19,14 @@ #include #include - +#include +#include +#include +#include +#include +#include + +#include #include #include #include @@ -27,7 +34,7 @@ #include -#define AF_PACKET_DEBUG_SOCKET 0 +af_packet_main_t af_packet_main; #define AF_PACKET_TX_FRAMES_PER_BLOCK 1024 #define AF_PACKET_TX_FRAME_SIZE (2048 * 5) @@ -45,12 +52,6 @@ #define AF_PACKET_RX_BLOCK_SIZE (AF_PACKET_RX_FRAME_SIZE * \ AF_PACKET_RX_FRAMES_PER_BLOCK) -#if AF_PACKET_DEBUG_SOCKET == 1 -#define DBG_SOCK(args...) clib_warning(args); -#else -#define DBG_SOCK(args...) -#endif - /*defined in net/if.h but clashes with dpdk headers */ unsigned int if_nametoindex (const char *ifname); @@ -60,50 +61,96 @@ static u32 af_packet_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags) { - /* nothing for now */ + clib_error_t *error; + u8 *s; + af_packet_main_t *apm = &af_packet_main; + af_packet_if_t *apif = + pool_elt_at_index (apm->interfaces, hi->dev_instance); + + if (ETHERNET_INTERFACE_FLAG_MTU == (flags & ETHERNET_INTERFACE_FLAG_MTU)) + { + s = format (0, "/sys/class/net/%s/mtu%c", apif->host_if_name, 0); + + error = clib_sysfs_write ((char *) s, "%d", hi->max_packet_bytes); + vec_free (s); + + if (error) + { + vlib_log_err (apm->log_class, + "sysfs write failed to change MTU: %U", + format_clib_error, error); + clib_error_free (error); + return VNET_API_ERROR_SYSCALL_ERROR_1; + } + } + return 0; } static clib_error_t * -af_packet_fd_read_ready (unix_file_t * uf) +af_packet_fd_read_ready (clib_file_t * uf) { - vlib_main_t *vm = vlib_get_main (); af_packet_main_t *apm = &af_packet_main; + vnet_main_t *vnm = vnet_get_main (); u32 idx = uf->private_data; + af_packet_if_t *apif = pool_elt_at_index (apm->interfaces, idx); apm->pending_input_bitmap = clib_bitmap_set (apm->pending_input_bitmap, idx, 1); /* Schedule the rx node */ - vlib_node_set_interrupt_pending (vm, af_packet_input_node.index); + vnet_device_input_set_interrupt_pending (vnm, apif->hw_if_index, 0); return 0; } static int -create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req, +is_bridge (const u8 * host_if_name) +{ + u8 *s; + DIR *dir = NULL; + + s = format (0, "/sys/class/net/%s/bridge%c", host_if_name, 0); + dir = opendir ((char *) s); + vec_free (s); + + if (dir) + { + closedir (dir); + return 0; + } + + return -1; +} + +static int +create_packet_v2_sock (int host_if_index, tpacket_req_t * rx_req, tpacket_req_t * tx_req, int *fd, u8 ** ring) { + af_packet_main_t *apm = &af_packet_main; int ret, err; struct sockaddr_ll sll; - uint host_if_index; int ver = TPACKET_V2; socklen_t req_sz = sizeof (struct tpacket_req); u32 ring_sz = rx_req->tp_block_size * rx_req->tp_block_nr + tx_req->tp_block_size * tx_req->tp_block_nr; - host_if_index = if_nametoindex ((const char *) name); - - if (!host_if_index) + if ((*fd = socket (AF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0) { - DBG_SOCK ("Wrong host interface name"); - ret = VNET_API_ERROR_INVALID_INTERFACE; + vlib_log_debug (apm->log_class, "Failed to create socket"); + ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } - if ((*fd = socket (AF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0) + /* bind before rx ring is cfged so we don't receive packets from other interfaces */ + memset (&sll, 0, sizeof (sll)); + sll.sll_family = PF_PACKET; + sll.sll_protocol = htons (ETH_P_ALL); + sll.sll_ifindex = host_if_index; + if ((err = bind (*fd, (struct sockaddr *) &sll, sizeof (sll))) < 0) { - DBG_SOCK ("Failed to create socket"); + vlib_log_debug (apm->log_class, + "Failed to bind rx packet socket (error %d)", err); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -111,7 +158,8 @@ create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req, if ((err = setsockopt (*fd, SOL_PACKET, PACKET_VERSION, &ver, sizeof (ver))) < 0) { - DBG_SOCK ("Failed to set rx packet interface version"); + vlib_log_debug (apm->log_class, + "Failed to set rx packet interface version"); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -120,7 +168,8 @@ create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req, if ((err = setsockopt (*fd, SOL_PACKET, PACKET_LOSS, &opt, sizeof (opt))) < 0) { - DBG_SOCK ("Failed to set packet tx ring error handling option"); + vlib_log_debug (apm->log_class, + "Failed to set packet tx ring error handling option"); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -128,7 +177,7 @@ create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req, if ((err = setsockopt (*fd, SOL_PACKET, PACKET_RX_RING, rx_req, req_sz)) < 0) { - DBG_SOCK ("Failed to set packet rx ring options"); + vlib_log_debug (apm->log_class, "Failed to set packet rx ring options"); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -136,7 +185,7 @@ create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req, if ((err = setsockopt (*fd, SOL_PACKET, PACKET_TX_RING, tx_req, req_sz)) < 0) { - DBG_SOCK ("Failed to set packet rx ring options"); + vlib_log_debug (apm->log_class, "Failed to set packet tx ring options"); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -146,19 +195,7 @@ create_packet_v2_sock (u8 * name, tpacket_req_t * rx_req, 0); if (*ring == MAP_FAILED) { - DBG_SOCK ("mmap failure"); - ret = VNET_API_ERROR_SYSCALL_ERROR_1; - goto error; - } - - memset (&sll, 0, sizeof (sll)); - sll.sll_family = PF_PACKET; - sll.sll_protocol = htons (ETH_P_ALL); - sll.sll_ifindex = host_if_index; - - if ((err = bind (*fd, (struct sockaddr *) &sll, sizeof (sll))) < 0) - { - DBG_SOCK ("Failed to bind rx packet socket (error %d)", err); + vlib_log_debug (apm->log_class, "mmap failure"); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -176,23 +213,29 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, u32 * sw_if_index) { af_packet_main_t *apm = &af_packet_main; - int ret, fd = -1; + int ret, fd = -1, fd2 = -1; struct tpacket_req *rx_req = 0; struct tpacket_req *tx_req = 0; + struct ifreq ifr; u8 *ring = 0; af_packet_if_t *apif = 0; u8 hw_addr[6]; clib_error_t *error; vnet_sw_interface_t *sw; + vnet_hw_interface_t *hw; + vlib_thread_main_t *tm = vlib_get_thread_main (); vnet_main_t *vnm = vnet_get_main (); uword *p; uword if_index; u8 *host_if_name_dup = vec_dup (host_if_name); + int host_if_index = -1; p = mhash_get (&apm->if_index_by_host_if_name, host_if_name); if (p) { - return VNET_API_ERROR_SUBIF_ALREADY_EXISTS; + apif = vec_elt_at_index (apm->interfaces, p[0]); + *sw_if_index = apif->sw_if_index; + return VNET_API_ERROR_IF_ALREADY_EXISTS; } vec_validate (rx_req, 0); @@ -207,15 +250,61 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, tx_req->tp_block_nr = AF_PACKET_TX_BLOCK_NR; tx_req->tp_frame_nr = AF_PACKET_TX_FRAME_NR; - ret = create_packet_v2_sock (host_if_name, rx_req, tx_req, &fd, &ring); + /* + * make sure host side of interface is 'UP' before binding AF_PACKET + * socket on it. + */ + if ((fd2 = socket (AF_UNIX, SOCK_DGRAM, 0)) < 0) + { + vlib_log_debug (apm->log_class, "Failed to create socket"); + ret = VNET_API_ERROR_SYSCALL_ERROR_1; + goto error; + } + + clib_memcpy (ifr.ifr_name, (const char *) host_if_name, + vec_len (host_if_name)); + if ((ret = ioctl (fd2, SIOCGIFINDEX, &ifr)) < 0) + { + vlib_log_debug (apm->log_class, "af_packet_create error: %d", ret); + close (fd2); + return VNET_API_ERROR_INVALID_INTERFACE; + } + + host_if_index = ifr.ifr_ifindex; + if ((ret = ioctl (fd2, SIOCGIFFLAGS, &ifr)) < 0) + { + vlib_log_warn (apm->log_class, "af_packet_create error: %d", ret); + goto error; + } + + if (!(ifr.ifr_flags & IFF_UP)) + { + ifr.ifr_flags |= IFF_UP; + if ((ret = ioctl (fd2, SIOCSIFFLAGS, &ifr)) < 0) + { + vlib_log_warn (apm->log_class, "af_packet_create error: %d", ret); + goto error; + } + } + + if (fd2 > -1) + close (fd2); + + ret = create_packet_v2_sock (host_if_index, rx_req, tx_req, &fd, &ring); if (ret != 0) goto error; + ret = is_bridge (host_if_name); + + if (ret == 0) /* is a bridge, ignore state */ + host_if_index = -1; + /* So far everything looks good, let's create interface */ pool_get (apm->interfaces, apif); if_index = apif - apm->interfaces; + apif->host_if_index = host_if_index; apif->fd = fd; apif->rx_ring = ring; apif->tx_ring = ring + rx_req->tp_block_size * rx_req->tp_block_nr; @@ -226,13 +315,18 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, apif->next_tx_frame = 0; apif->next_rx_frame = 0; + if (tm->n_vlib_mains > 1) + clib_spinlock_init (&apif->lockp); + { - unix_file_t template = { 0 }; + clib_file_t template = { 0 }; template.read_function = af_packet_fd_read_ready; template.file_descriptor = fd; template.private_data = if_index; template.flags = UNIX_FILE_EVENT_EDGE_TRIGGERED; - apif->unix_file_index = unix_file_add (&unix_main, &template); + template.description = format (0, "%U", format_af_packet_device_name, + if_index); + apif->clib_file_index = clib_file_add (&file_main, &template); } /*use configured or generate random MAC address */ @@ -258,24 +352,39 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, { memset (apif, 0, sizeof (*apif)); pool_put (apm->interfaces, apif); - clib_error_report (error); + vlib_log_err (apm->log_class, "Unable to register interface: %U", + format_clib_error, error); + clib_error_free (error); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } sw = vnet_get_hw_sw_interface (vnm, apif->hw_if_index); + hw = vnet_get_hw_interface (vnm, apif->hw_if_index); apif->sw_if_index = sw->sw_if_index; + vnet_hw_interface_set_input_node (vnm, apif->hw_if_index, + af_packet_input_node.index); + + vnet_hw_interface_assign_rx_thread (vnm, apif->hw_if_index, 0, /* queue */ + ~0 /* any cpu */ ); + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE; vnet_hw_interface_set_flags (vnm, apif->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); + vnet_hw_interface_set_rx_mode (vnm, apif->hw_if_index, 0, + VNET_HW_INTERFACE_RX_MODE_INTERRUPT); + mhash_set_mem (&apm->if_index_by_host_if_name, host_if_name_dup, &if_index, 0); if (sw_if_index) *sw_if_index = apif->sw_if_index; + return 0; error: + if (fd2 > -1) + close (fd2); vec_free (host_if_name_dup); vec_free (rx_req); vec_free (tx_req); @@ -295,7 +404,8 @@ af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) p = mhash_get (&apm->if_index_by_host_if_name, host_if_name); if (p == NULL) { - clib_warning ("Host interface %s does not exist", host_if_name); + vlib_log_warn (apm->log_class, "Host interface %s does not exist", + host_if_name); return VNET_API_ERROR_SYSCALL_ERROR_1; } apif = pool_elt_at_index (apm->interfaces, p[0]); @@ -303,12 +413,13 @@ af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) /* bring down the interface */ vnet_hw_interface_set_flags (vnm, apif->hw_if_index, 0); + vnet_hw_interface_unassign_rx_thread (vnm, apif->hw_if_index, 0); /* clean up */ - if (apif->unix_file_index != ~0) + if (apif->clib_file_index != ~0) { - unix_file_del (&unix_main, unix_main.file_pool + apif->unix_file_index); - apif->unix_file_index = ~0; + clib_file_del (&file_main, file_main.file_pool + apif->clib_file_index); + apif->clib_file_index = ~0; } else close (apif->fd); @@ -316,8 +427,9 @@ af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) ring_sz = apif->rx_req->tp_block_size * apif->rx_req->tp_block_nr + apif->tx_req->tp_block_size * apif->tx_req->tp_block_nr; if (munmap (apif->rx_ring, ring_sz)) - clib_warning ("Host interface %s could not free rx/tx ring", - host_if_name); + vlib_log_warn (apm->log_class, + "Host interface %s could not free rx/tx ring", + host_if_name); apif->rx_ring = NULL; apif->tx_ring = NULL; apif->fd = -1; @@ -329,6 +441,7 @@ af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) vec_free (apif->host_if_name); apif->host_if_name = NULL; + apif->host_if_index = -1; mhash_unset (&apm->if_index_by_host_if_name, host_if_name, &if_index); @@ -339,6 +452,50 @@ af_packet_delete_if (vlib_main_t * vm, u8 * host_if_name) return 0; } +int +af_packet_set_l4_cksum_offload (vlib_main_t * vm, u32 sw_if_index, u8 set) +{ + vnet_main_t *vnm = vnet_get_main (); + vnet_hw_interface_t *hw; + + hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + + if (hw->dev_class_index != af_packet_device_class.index) + return VNET_API_ERROR_INVALID_INTERFACE; + + if (set) + hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; + else + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; + + return 0; +} + +int +af_packet_dump_ifs (af_packet_if_detail_t ** out_af_packet_ifs) +{ + af_packet_main_t *apm = &af_packet_main; + af_packet_if_t *apif; + af_packet_if_detail_t *r_af_packet_ifs = NULL; + af_packet_if_detail_t *af_packet_if = NULL; + + vec_foreach (apif, apm->interfaces) + { + vec_add2 (r_af_packet_ifs, af_packet_if, 1); + af_packet_if->sw_if_index = apif->sw_if_index; + if (apif->host_if_name) + { + clib_memcpy (af_packet_if->host_if_name, apif->host_if_name, + MIN (ARRAY_LEN (af_packet_if->host_if_name) - 1, + strlen ((const char *) apif->host_if_name))); + } + } + + *out_af_packet_ifs = r_af_packet_ifs; + + return 0; +} + static clib_error_t * af_packet_init (vlib_main_t * vm) { @@ -352,6 +509,9 @@ af_packet_init (vlib_main_t * vm) vec_validate_aligned (apm->rx_buffers, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); + apm->log_class = vlib_log_register_class ("af_packet", 0); + vlib_log_debug (apm->log_class, "initialized"); + return 0; }