X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Ftep_termination%2Fvxlan_setup.c;h=4b44ccc143078e67d4838038156649944a062526;hb=eeb486f3ba651b594506427e0c67dcf31730183a;hp=299c29d276ffb7398a0ac7a0cad94083978c611f;hpb=a9dbe180222680edf8c49e86791f972549ce5be3;p=dpdk.git diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c index 299c29d276..4b44ccc143 100644 --- a/examples/tep_termination/vxlan_setup.c +++ b/examples/tep_termination/vxlan_setup.c @@ -28,10 +28,7 @@ #define UDP_HEADER_LEN 8 #define VXLAN_HEADER_LEN 8 -#define IP_VERSION 0x40 -#define IP_HDRLEN 0x05 /* default IP header length == five 32-bits words. */ #define IP_DEFTTL 64 /* from RFC 1340. */ -#define IP_VHL_DEF (IP_VERSION | IP_HDRLEN) #define IP_DN_FRAGMENT_FLAG 0x0040 @@ -48,8 +45,8 @@ /* VXLAN device */ struct vxlan_conf vxdev; -struct ipv4_hdr app_ip_hdr[VXLAN_N_PORTS]; -struct ether_hdr app_l2_hdr[VXLAN_N_PORTS]; +struct rte_ipv4_hdr app_ip_hdr[VXLAN_N_PORTS]; +struct rte_ether_hdr app_l2_hdr[VXLAN_N_PORTS]; /* local VTEP IP address */ uint8_t vxlan_multicast_ips[2][4] = { {239, 1, 1, 1 }, {239, 1, 2, 1 } }; @@ -69,8 +66,6 @@ uint8_t tep_filter_type[] = {RTE_TUNNEL_FILTER_IMAC_TENID, static struct rte_eth_conf port_conf = { .rxmode = { .split_hdr_size = 0, - .ignore_offload_bitfield = 1, - .offloads = DEV_RX_OFFLOAD_CRC_STRIP, }, .txmode = { .mq_mode = ETH_MQ_TX_NONE, @@ -121,7 +116,11 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) pconf->dst_port = udp_port; - rte_eth_dev_info_get(port, &dev_info); + retval = rte_eth_dev_info_get(port, &dev_info); + if (retval != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device (port %u) info: %s\n", + port, strerror(-retval)); if (dev_info.max_rx_queues > MAX_QUEUES) { rte_exit(EXIT_FAILURE, @@ -131,7 +130,6 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) rxconf = &dev_info.default_rxconf; txconf = &dev_info.default_txconf; - txconf->txq_flags = ETH_TXQ_FLAGS_IGNORE; if (!rte_eth_dev_is_valid_port(port)) return -1; @@ -181,7 +179,10 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) retval = rte_eth_dev_udp_tunnel_port_add(port, &tunnel_udp); if (retval < 0) return retval; - rte_eth_macaddr_get(port, &ports_eth_addr[port]); + retval = rte_eth_macaddr_get(port, &ports_eth_addr[port]); + if (retval < 0) + return retval; + RTE_LOG(INFO, PORT, "Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8 " %02"PRIx8" %02"PRIx8" %02"PRIx8"\n", port, @@ -193,8 +194,6 @@ vxlan_port_init(uint16_t port, struct rte_mempool *mbuf_pool) ports_eth_addr[port].addr_bytes[5]); if (tso_segsz != 0) { - struct rte_eth_dev_info dev_info; - rte_eth_dev_info_get(port, &dev_info); if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_TCP_TSO) == 0) RTE_LOG(WARNING, PORT, "hardware TSO offload is not supported\n"); @@ -230,9 +229,9 @@ int vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m) { int i, ret; - struct ether_hdr *pkt_hdr; + struct rte_ether_hdr *pkt_hdr; uint64_t portid = vdev->vid; - struct ipv4_hdr *ip; + struct rte_ipv4_hdr *ip; struct rte_eth_tunnel_filter_conf tunnel_filter_conf; @@ -245,8 +244,8 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m) } /* Learn MAC address of guest device from packet */ - pkt_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); - if (is_same_ether_addr(&(pkt_hdr->s_addr), &vdev->mac_address)) { + pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); + if (rte_is_same_ether_addr(&(pkt_hdr->s_addr), &vdev->mac_address)) { RTE_LOG(INFO, VHOST_DATA, "(%d) WARNING: This device is using an existing" " MAC address and has not been registered.\n", @@ -254,7 +253,7 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m) return -1; } - for (i = 0; i < ETHER_ADDR_LEN; i++) { + for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) { vdev->mac_address.addr_bytes[i] = vxdev.port[portid].vport_mac.addr_bytes[i] = pkt_hdr->s_addr.addr_bytes[i]; @@ -264,11 +263,11 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m) memset(&tunnel_filter_conf, 0, sizeof(struct rte_eth_tunnel_filter_conf)); - ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac); + rte_ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac); tunnel_filter_conf.filter_type = tep_filter_type[filter_idx]; /* inner MAC */ - ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac); + rte_ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac); tunnel_filter_conf.queue_id = vdev->rx_q; tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q]; @@ -312,14 +311,14 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m) } vxdev.out_key = tenant_id_conf[vdev->rx_q]; - ether_addr_copy(&vxdev.port[portid].peer_mac, + rte_ether_addr_copy(&vxdev.port[portid].peer_mac, &app_l2_hdr[portid].d_addr); - ether_addr_copy(&ports_eth_addr[0], + rte_ether_addr_copy(&ports_eth_addr[0], &app_l2_hdr[portid].s_addr); - app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4); + app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); ip = &app_ip_hdr[portid]; - ip->version_ihl = IP_VHL_DEF; + ip->version_ihl = RTE_IPV4_VHL_DEF; ip->type_of_service = 0; ip->total_length = 0; ip->packet_id = 0; @@ -352,8 +351,10 @@ vxlan_unlink(struct vhost_dev *vdev) memset(&tunnel_filter_conf, 0, sizeof(struct rte_eth_tunnel_filter_conf)); - ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac); - ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac); + rte_ether_addr_copy(&ports_eth_addr[0], + &tunnel_filter_conf.outer_mac); + rte_ether_addr_copy(&vdev->mac_address, + &tunnel_filter_conf.inner_mac); tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q]; tunnel_filter_conf.filter_type = tep_filter_type[filter_idx]; @@ -374,7 +375,7 @@ vxlan_unlink(struct vhost_dev *vdev) vdev->rx_q); return; } - for (i = 0; i < ETHER_ADDR_LEN; i++) + for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) vdev->mac_address.addr_bytes[i] = 0; /* Clear out the receive buffers */