git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
test/eal: set memory channel config only in dedicated test
[dpdk.git] / app / test-pmd / csumonly.c
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index d1344b9..e1cb7fb 100644 (file)
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -92,46 +92,48 @@ struct simple_gre_hdr {
 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);
 }
 
 /* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */
 static void
-parse_ipv4(struct ipv4_hdr *ipv4_hdr, struct testpmd_offload_info *info)
+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;
 }
 
 /* Parse an IPv6 header to fill l3_len, l4_len, and l4_proto */
 static void
-parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
+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 ipv6_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;
 }
@@ -144,8 +146,8 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
 static void
 parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
 {
-       struct ipv4_hdr *ipv4_hdr;
-       struct ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
 
        info->l2_len = sizeof(struct rte_ether_hdr);
        info->ethertype = eth_hdr->ether_type;
@@ -159,12 +161,14 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
        }
 
        switch (info->ethertype) {
-       case _htons(RTE_ETHER_TYPE_IPv4):
-               ipv4_hdr = (struct ipv4_hdr *) ((char *)eth_hdr + info->l2_len);
+       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):
-               ipv6_hdr = (struct ipv6_hdr *) ((char *)eth_hdr + info->l2_len);
+       case _htons(RTE_ETHER_TYPE_IPV6):
+               ipv6_hdr = (struct rte_ipv6_hdr *)
+                       ((char *)eth_hdr + info->l2_len);
                parse_ipv6(ipv6_hdr, info);
                break;
        default:
@@ -177,7 +181,7 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
 
 /* 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)
 {
@@ -197,7 +201,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);
@@ -206,12 +210,12 @@ 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;
-       struct ipv4_hdr *ipv4_hdr;
-       struct ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
        struct rte_vxlan_gpe_hdr *vxlan_gpe_hdr;
        uint8_t vxlan_gpe_len = sizeof(*vxlan_gpe_hdr);
 
@@ -220,7 +224,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) {
@@ -230,11 +234,11 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv4_hdr = (struct ipv4_hdr *)((char *)vxlan_gpe_hdr +
+               ipv4_hdr = (struct rte_ipv4_hdr *)((char *)vxlan_gpe_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) {
@@ -244,10 +248,10 @@ parse_vxlan_gpe(struct udp_hdr *udp_hdr,
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv6_hdr = (struct ipv6_hdr *)((char *)vxlan_gpe_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;
 
@@ -273,8 +277,8 @@ static void
 parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 {
        struct rte_ether_hdr *eth_hdr;
-       struct ipv4_hdr *ipv4_hdr;
-       struct ipv6_hdr *ipv6_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr;
        uint8_t gre_len = 0;
 
        gre_len += sizeof(struct simple_gre_hdr);
@@ -286,29 +290,29 @@ 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;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv4_hdr = (struct ipv4_hdr *)((char *)gre_hdr + gre_len);
+               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;
                info->outer_l3_len = info->l3_len;
                info->outer_l4_proto = info->l4_proto;
 
-               ipv6_hdr = (struct ipv6_hdr *)((char *)gre_hdr + gre_len);
+               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;
 
@@ -333,8 +337,8 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info)
 static void
 parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info)
 {
-       struct ipv4_hdr *ipv4_hdr = encap_ip;
-       struct ipv6_hdr *ipv6_hdr = encap_ip;
+       struct rte_ipv4_hdr *ipv4_hdr = encap_ip;
+       struct rte_ipv6_hdr *ipv6_hdr = encap_ip;
        uint8_t ip_version;
 
        ip_version = (ipv4_hdr->version_ihl & 0xf0) >> 4;
@@ -349,10 +353,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;
 }
@@ -363,10 +367,10 @@ static uint64_t
 process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
        uint64_t tx_offloads)
 {
-       struct ipv4_hdr *ipv4_hdr = l3_hdr;
-       struct udp_hdr *udp_hdr;
-       struct tcp_hdr *tcp_hdr;
-       struct sctp_hdr *sctp_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr = l3_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;
 
@@ -384,7 +388,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;
 
@@ -398,13 +402,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;
@@ -419,7 +423,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;
@@ -433,7 +437,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 */
@@ -454,12 +459,12 @@ static uint64_t
 process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
        uint64_t tx_offloads, int tso_enabled)
 {
-       struct ipv4_hdr *ipv4_hdr = outer_l3_hdr;
-       struct ipv6_hdr *ipv6_hdr = outer_l3_hdr;
-       struct udp_hdr *udp_hdr;
+       struct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr;
+       struct rte_ipv6_hdr *ipv6_hdr = outer_l3_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;
 
@@ -479,7 +484,8 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
                return ol_flags;
        }
 
-       udp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + info->outer_l3_len);
+       udp_hdr = (struct rte_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
@@ -495,7 +501,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
@@ -777,10 +783,10 @@ 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_vxlan_gpe(udp_hdr, &info);
                                if (info.is_tunnel) {
                                        tx_ol_flags |= PKT_TX_TUNNEL_VXLAN_GPE;
DPDK repo used for reviews