X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fcsumonly.c;h=0a96b24eb27b499a78617aa9d029313aa498fc73;hb=fbc8c7003b93a7555887a4195678aca9ee69f4ae;hp=9e6630e8060dc9cb26b4f2d705830a1ad293beb2;hpb=a7c528e5d71ff3f569898d268f9de129fdfc152b;p=dpdk.git diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 9e6630e806..0a96b24eb2 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -35,7 +35,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -45,9 +47,6 @@ #include "testpmd.h" #define IP_DEFTTL 64 /* from RFC 1340. */ -#define IP_VERSION 0x40 -#define IP_HDRLEN 0x05 /* default IP header length == five 32-bits words. */ -#define IP_VHL_DEF (IP_VERSION | IP_HDRLEN) #define GRE_CHECKSUM_PRESENT 0x8000 #define GRE_KEY_PRESENT 0x2000 @@ -87,14 +86,14 @@ struct testpmd_offload_info { struct simple_gre_hdr { uint16_t flags; uint16_t proto; -} __attribute__((__packed__)); +} __rte_packed; static uint16_t get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype) { - if (ethertype == _htons(RTE_ETHER_TYPE_IPv4)) + if (ethertype == _htons(RTE_ETHER_TYPE_IPV4)) return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); - else /* assume ethertype == RTE_ETHER_TYPE_IPv6 */ + else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); } @@ -102,17 +101,18 @@ get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype) static void parse_ipv4(struct rte_ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info) { - struct tcp_hdr *tcp_hdr; + struct rte_tcp_hdr *tcp_hdr; info->l3_len = (ipv4_hdr->version_ihl & 0x0f) * 4; info->l4_proto = ipv4_hdr->next_proto_id; /* only fill l4_len for TCP, it's useful for TSO */ if (info->l4_proto == IPPROTO_TCP) { - tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + info->l3_len); + tcp_hdr = (struct rte_tcp_hdr *) + ((char *)ipv4_hdr + info->l3_len); info->l4_len = (tcp_hdr->data_off & 0xf0) >> 2; } else if (info->l4_proto == IPPROTO_UDP) - info->l4_len = sizeof(struct udp_hdr); + info->l4_len = sizeof(struct rte_udp_hdr); else info->l4_len = 0; } @@ -121,50 +121,52 @@ parse_ipv4(struct rte_ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info) static void parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info) { - struct tcp_hdr *tcp_hdr; + struct rte_tcp_hdr *tcp_hdr; info->l3_len = sizeof(struct rte_ipv6_hdr); info->l4_proto = ipv6_hdr->proto; /* only fill l4_len for TCP, it's useful for TSO */ if (info->l4_proto == IPPROTO_TCP) { - tcp_hdr = (struct tcp_hdr *)((char *)ipv6_hdr + info->l3_len); + tcp_hdr = (struct rte_tcp_hdr *) + ((char *)ipv6_hdr + info->l3_len); info->l4_len = (tcp_hdr->data_off & 0xf0) >> 2; } else if (info->l4_proto == IPPROTO_UDP) - info->l4_len = sizeof(struct udp_hdr); + info->l4_len = sizeof(struct rte_udp_hdr); else info->l4_len = 0; } /* * Parse an ethernet header to fill the ethertype, l2_len, l3_len and - * ipproto. This function is able to recognize IPv4/IPv6 with one optional vlan - * header. The l4_len argument is only set in case of TCP (useful for TSO). + * ipproto. This function is able to recognize IPv4/IPv6 with optional VLAN + * headers. The l4_len argument is only set in case of TCP (useful for TSO). */ static void parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info) { struct rte_ipv4_hdr *ipv4_hdr; struct rte_ipv6_hdr *ipv6_hdr; + struct rte_vlan_hdr *vlan_hdr; info->l2_len = sizeof(struct rte_ether_hdr); info->ethertype = eth_hdr->ether_type; - if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) { - struct rte_vlan_hdr *vlan_hdr = ( - struct rte_vlan_hdr *)(eth_hdr + 1); - + while (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN) || + info->ethertype == _htons(RTE_ETHER_TYPE_QINQ)) { + vlan_hdr = (struct rte_vlan_hdr *) + ((char *)eth_hdr + info->l2_len); info->l2_len += sizeof(struct rte_vlan_hdr); info->ethertype = vlan_hdr->eth_proto; } switch (info->ethertype) { - case _htons(RTE_ETHER_TYPE_IPv4): + case _htons(RTE_ETHER_TYPE_IPV4): ipv4_hdr = (struct rte_ipv4_hdr *) ((char *)eth_hdr + info->l2_len); parse_ipv4(ipv4_hdr, info); break; - case _htons(RTE_ETHER_TYPE_IPv6): + case _htons(RTE_ETHER_TYPE_IPV6): ipv6_hdr = (struct rte_ipv6_hdr *) ((char *)eth_hdr + info->l2_len); parse_ipv6(ipv6_hdr, info); @@ -177,9 +179,70 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info) } } +/* + * Parse a GTP protocol header. + * No optional fields and next extension header type. + */ +static void +parse_gtp(struct rte_udp_hdr *udp_hdr, + struct testpmd_offload_info *info) +{ + struct rte_ipv4_hdr *ipv4_hdr; + struct rte_ipv6_hdr *ipv6_hdr; + struct rte_gtp_hdr *gtp_hdr; + uint8_t gtp_len = sizeof(*gtp_hdr); + uint8_t ip_ver; + + /* Check udp destination port. */ + if (udp_hdr->dst_port != _htons(RTE_GTPC_UDP_PORT) && + udp_hdr->src_port != _htons(RTE_GTPC_UDP_PORT) && + udp_hdr->dst_port != _htons(RTE_GTPU_UDP_PORT)) + return; + + info->is_tunnel = 1; + info->outer_ethertype = info->ethertype; + info->outer_l2_len = info->l2_len; + info->outer_l3_len = info->l3_len; + info->outer_l4_proto = info->l4_proto; + info->l2_len = 0; + + gtp_hdr = (struct rte_gtp_hdr *)((char *)udp_hdr + + sizeof(struct rte_udp_hdr)); + + /* + * Check message type. If message type is 0xff, it is + * a GTP data packet. If not, it is a GTP control packet + */ + if (gtp_hdr->msg_type == 0xff) { + ip_ver = *(uint8_t *)((char *)udp_hdr + + sizeof(struct rte_udp_hdr) + + sizeof(struct rte_gtp_hdr)); + ip_ver = (ip_ver) & 0xf0; + + if (ip_ver == RTE_GTP_TYPE_IPV4) { + ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gtp_hdr + + gtp_len); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); + parse_ipv4(ipv4_hdr, info); + } else if (ip_ver == RTE_GTP_TYPE_IPV6) { + ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gtp_hdr + + gtp_len); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); + parse_ipv6(ipv6_hdr, info); + } + } else { + info->ethertype = 0; + info->l4_len = 0; + info->l3_len = 0; + info->l4_proto = 0; + } + + info->l2_len += RTE_ETHER_GTP_HLEN; +} + /* Parse a vxlan header */ static void -parse_vxlan(struct udp_hdr *udp_hdr, +parse_vxlan(struct rte_udp_hdr *udp_hdr, struct testpmd_offload_info *info, uint32_t pkt_type) { @@ -199,7 +262,7 @@ parse_vxlan(struct udp_hdr *udp_hdr, info->outer_l4_proto = info->l4_proto; eth_hdr = (struct rte_ether_hdr *)((char *)udp_hdr + - sizeof(struct udp_hdr) + + sizeof(struct rte_udp_hdr) + sizeof(struct rte_vxlan_hdr)); parse_ethernet(eth_hdr, info); @@ -208,7 +271,7 @@ parse_vxlan(struct udp_hdr *udp_hdr, /* Parse a vxlan-gpe header */ static void -parse_vxlan_gpe(struct udp_hdr *udp_hdr, +parse_vxlan_gpe(struct rte_udp_hdr *udp_hdr, struct testpmd_offload_info *info) { struct rte_ether_hdr *eth_hdr; @@ -222,7 +285,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr, return; vxlan_gpe_hdr = (struct rte_vxlan_gpe_hdr *)((char *)udp_hdr + - sizeof(struct udp_hdr)); + sizeof(struct rte_udp_hdr)); if (!vxlan_gpe_hdr->proto || vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_IPV4) { @@ -236,7 +299,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr, vxlan_gpe_len); parse_ipv4(ipv4_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv4); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); info->l2_len = 0; } else if (vxlan_gpe_hdr->proto == RTE_VXLAN_GPE_TYPE_IPV6) { @@ -249,7 +312,7 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr, ipv6_hdr = (struct rte_ipv6_hdr *)((char *)vxlan_gpe_hdr + vxlan_gpe_len); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); parse_ipv6(ipv6_hdr, info); info->l2_len = 0; @@ -288,7 +351,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info) if (gre_hdr->flags & _htons(GRE_CHECKSUM_PRESENT)) gre_len += GRE_EXT_LEN; - if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv4)) { + if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPV4)) { info->is_tunnel = 1; info->outer_ethertype = info->ethertype; info->outer_l2_len = info->l2_len; @@ -298,10 +361,10 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info) ipv4_hdr = (struct rte_ipv4_hdr *)((char *)gre_hdr + gre_len); parse_ipv4(ipv4_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv4); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); info->l2_len = 0; - } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPv6)) { + } else if (gre_hdr->proto == _htons(RTE_ETHER_TYPE_IPV6)) { info->is_tunnel = 1; info->outer_ethertype = info->ethertype; info->outer_l2_len = info->l2_len; @@ -310,7 +373,7 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info) ipv6_hdr = (struct rte_ipv6_hdr *)((char *)gre_hdr + gre_len); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); parse_ipv6(ipv6_hdr, info); info->l2_len = 0; @@ -351,10 +414,10 @@ parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info) if (ip_version == 4) { parse_ipv4(ipv4_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv4); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV4); } else { parse_ipv6(ipv6_hdr, info); - info->ethertype = _htons(RTE_ETHER_TYPE_IPv6); + info->ethertype = _htons(RTE_ETHER_TYPE_IPV6); } info->l2_len = 0; } @@ -366,9 +429,9 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, uint64_t tx_offloads) { struct rte_ipv4_hdr *ipv4_hdr = l3_hdr; - struct udp_hdr *udp_hdr; - struct tcp_hdr *tcp_hdr; - struct sctp_hdr *sctp_hdr; + struct rte_udp_hdr *udp_hdr; + struct rte_tcp_hdr *tcp_hdr; + struct rte_sctp_hdr *sctp_hdr; uint64_t ol_flags = 0; uint32_t max_pkt_len, tso_segsz = 0; @@ -386,7 +449,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, tso_segsz = info->tunnel_tso_segsz; } - if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv4)) { + if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV4)) { ipv4_hdr = l3_hdr; ipv4_hdr->hdr_checksum = 0; @@ -400,13 +463,13 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, ipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr); } - } else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPv6)) + } else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV6)) ol_flags |= PKT_TX_IPV6; else return 0; /* packet type not supported, nothing to do */ if (info->l4_proto == IPPROTO_UDP) { - udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info->l3_len); + udp_hdr = (struct rte_udp_hdr *)((char *)l3_hdr + info->l3_len); /* do not recalculate udp cksum if it was 0 */ if (udp_hdr->dgram_cksum != 0) { udp_hdr->dgram_cksum = 0; @@ -421,7 +484,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, if (info->gso_enable) ol_flags |= PKT_TX_UDP_SEG; } else if (info->l4_proto == IPPROTO_TCP) { - tcp_hdr = (struct tcp_hdr *)((char *)l3_hdr + info->l3_len); + tcp_hdr = (struct rte_tcp_hdr *)((char *)l3_hdr + info->l3_len); tcp_hdr->cksum = 0; if (tso_segsz) ol_flags |= PKT_TX_TCP_SEG; @@ -435,7 +498,8 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, if (info->gso_enable) ol_flags |= PKT_TX_TCP_SEG; } else if (info->l4_proto == IPPROTO_SCTP) { - sctp_hdr = (struct sctp_hdr *)((char *)l3_hdr + info->l3_len); + sctp_hdr = (struct rte_sctp_hdr *) + ((char *)l3_hdr + info->l3_len); sctp_hdr->cksum = 0; /* sctp payload must be a multiple of 4 to be * offloaded */ @@ -458,10 +522,10 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, { struct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr; struct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr; - struct udp_hdr *udp_hdr; + struct rte_udp_hdr *udp_hdr; uint64_t ol_flags = 0; - if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPv4)) { + if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) { ipv4_hdr->hdr_checksum = 0; ol_flags |= PKT_TX_OUTER_IPV4; @@ -475,14 +539,25 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, if (info->outer_l4_proto != IPPROTO_UDP) return ol_flags; + udp_hdr = (struct rte_udp_hdr *) + ((char *)outer_l3_hdr + info->outer_l3_len); + + if (tso_enabled) + ol_flags |= PKT_TX_TCP_SEG; + /* Skip SW outer UDP checksum generation if HW supports it */ if (tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) { + if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) + udp_hdr->dgram_cksum + = rte_ipv4_phdr_cksum(ipv4_hdr, ol_flags); + else + udp_hdr->dgram_cksum + = rte_ipv6_phdr_cksum(ipv6_hdr, ol_flags); + ol_flags |= PKT_TX_OUTER_UDP_CKSUM; return ol_flags; } - udp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + info->outer_l3_len); - /* outer UDP checksum is done in software. In the other side, for * UDP tunneling, like VXLAN or Geneve, outer UDP checksum can be * set to zero. @@ -497,7 +572,7 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, /* do not recalculate udp cksum if it was 0 */ if (udp_hdr->dgram_cksum != 0) { udp_hdr->dgram_cksum = 0; - if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPv4)) + if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) udp_hdr->dgram_cksum = rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr); else @@ -675,6 +750,7 @@ pkt_copy_split(const struct rte_mbuf *pkt) * UDP|TCP|SCTP * Ether / (vlan) / outer IP|IP6 / outer UDP / VXLAN-GPE / IP|IP6 / * UDP|TCP|SCTP + * Ether / (vlan) / outer IP / outer UDP / GTP / IP|IP6 / UDP|TCP|SCTP * Ether / (vlan) / outer IP|IP6 / GRE / Ether / IP|IP6 / UDP|TCP|SCTP * Ether / (vlan) / outer IP|IP6 / GRE / IP|IP6 / UDP|TCP|SCTP * Ether / (vlan) / outer IP|IP6 / IP|IP6 / UDP|TCP|SCTP @@ -726,11 +802,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) /* receive a burst of packet */ nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, nb_pkt_per_burst); - if (unlikely(nb_rx == 0)) - return; #ifdef RTE_TEST_PMD_RECORD_BURST_STATS fs->rx_burst_stats.pkt_burst_spread[nb_rx]++; #endif + if (unlikely(nb_rx == 0)) + return; + fs->rx_packets += nb_rx; rx_bad_ip_csum = 0; rx_bad_l4_csum = 0; @@ -779,20 +856,26 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) /* check if it's a supported tunnel */ if (txp->parse_tunnel) { if (info.l4_proto == IPPROTO_UDP) { - struct udp_hdr *udp_hdr; + struct rte_udp_hdr *udp_hdr; - udp_hdr = (struct udp_hdr *)((char *)l3_hdr + - info.l3_len); + udp_hdr = (struct rte_udp_hdr *) + ((char *)l3_hdr + info.l3_len); + parse_gtp(udp_hdr, &info); + if (info.is_tunnel) { + tx_ol_flags |= PKT_TX_TUNNEL_GTP; + goto tunnel_update; + } parse_vxlan_gpe(udp_hdr, &info); if (info.is_tunnel) { - tx_ol_flags |= PKT_TX_TUNNEL_VXLAN_GPE; - } else { - parse_vxlan(udp_hdr, &info, - m->packet_type); - if (info.is_tunnel) - tx_ol_flags |= - PKT_TX_TUNNEL_VXLAN; + tx_ol_flags |= + PKT_TX_TUNNEL_VXLAN_GPE; + goto tunnel_update; } + parse_vxlan(udp_hdr, &info, + m->packet_type); + if (info.is_tunnel) + tx_ol_flags |= + PKT_TX_TUNNEL_VXLAN; } else if (info.l4_proto == IPPROTO_GRE) { struct simple_gre_hdr *gre_hdr; @@ -811,6 +894,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) } } +tunnel_update: /* update l3_hdr and outer_l3_hdr if a tunnel was parsed */ if (info.is_tunnel) { outer_l3_hdr = l3_hdr;