X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Faf_packet%2Faf_packet.c;h=e58f278276595876556bc353228e3a716b9e8ca5;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=62bb228f04f3b0c91d9aa98b05f8b76147ecbb3f;hpb=56dd5438b04b869065d8e901c315496bb6777455;p=vpp.git diff --git a/src/vnet/devices/af_packet/af_packet.c b/src/vnet/devices/af_packet/af_packet.c index 62bb228f04f..e58f2782765 100644 --- a/src/vnet/devices/af_packet/af_packet.c +++ b/src/vnet/devices/af_packet/af_packet.c @@ -19,20 +19,22 @@ #include #include +#include +#include #include #include #include #include +#include #include #include -#include #include #include #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) @@ -50,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); @@ -75,12 +71,15 @@ af_packet_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, { s = format (0, "/sys/class/net/%s/mtu%c", apif->host_if_name, 0); - error = vlib_sysfs_write ((char *) s, "%d", hi->max_packet_bytes); + error = clib_sysfs_write ((char *) s, "%d", hi->max_packet_bytes); vec_free (s); if (error) { - clib_error_report (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; } } @@ -128,6 +127,7 @@ 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; int ver = TPACKET_V2; @@ -137,7 +137,20 @@ create_packet_v2_sock (int host_if_index, tpacket_req_t * rx_req, if ((*fd = socket (AF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0) { - DBG_SOCK ("Failed to create socket"); + vlib_log_debug (apm->log_class, "Failed to create socket"); + ret = VNET_API_ERROR_SYSCALL_ERROR_1; + goto error; + } + + /* bind before rx ring is cfged so we don't receive packets from other interfaces */ + clib_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) + { + vlib_log_debug (apm->log_class, + "Failed to bind rx packet socket (error %d)", err); ret = VNET_API_ERROR_SYSCALL_ERROR_1; goto error; } @@ -145,7 +158,8 @@ create_packet_v2_sock (int host_if_index, 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; } @@ -154,7 +168,8 @@ create_packet_v2_sock (int host_if_index, 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; } @@ -162,7 +177,7 @@ create_packet_v2_sock (int host_if_index, 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; } @@ -170,7 +185,7 @@ create_packet_v2_sock (int host_if_index, 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; } @@ -180,19 +195,7 @@ create_packet_v2_sock (int host_if_index, 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; } @@ -210,9 +213,10 @@ 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]; @@ -229,7 +233,9 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, 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); @@ -244,14 +250,46 @@ 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; - host_if_index = if_nametoindex ((const char *) host_if_name); + /* + * 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; + } - if (!host_if_index) + clib_memcpy (ifr.ifr_name, (const char *) host_if_name, + vec_len (host_if_name)); + if ((ret = ioctl (fd2, SIOCGIFINDEX, &ifr)) < 0) { - DBG_SOCK ("Wrong host interface name"); + 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) @@ -286,6 +324,8 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, template.file_descriptor = fd; template.private_data = if_index; template.flags = UNIX_FILE_EVENT_EDGE_TRIGGERED; + template.description = format (0, "%U", format_af_packet_device_name, + if_index); apif->clib_file_index = clib_file_add (&file_main, &template); } @@ -310,9 +350,11 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, if (error) { - memset (apif, 0, sizeof (*apif)); + clib_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; } @@ -341,6 +383,8 @@ af_packet_create_if (vlib_main_t * vm, u8 * host_if_name, u8 * hw_addr_set, return 0; error: + if (fd2 > -1) + close (fd2); vec_free (host_if_name_dup); vec_free (rx_req); vec_free (tx_req); @@ -360,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]); @@ -382,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; @@ -406,19 +452,66 @@ 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) { af_packet_main_t *apm = &af_packet_main; vlib_thread_main_t *tm = vlib_get_thread_main (); - memset (apm, 0, sizeof (af_packet_main_t)); + clib_memset (apm, 0, sizeof (af_packet_main_t)); mhash_init_vec_string (&apm->if_index_by_host_if_name, sizeof (uword)); 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; }