From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) by dpdk.org (Postfix) with ESMTP id 2B945B3D6 for ; Wed, 4 Feb 2015 10:26:02 +0100 (CET) Received: by mail-we0-f181.google.com with SMTP id k48so510327wev.12 for ; Wed, 04 Feb 2015 01:26:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+AUl4Qp/OC5+VlRtL953WXnJvqqVJIQgLqjF/1wwXFk=; b=Big6jUHkRF5YkW/k6glBgIE12IuzBEb8NUNNqj7CYAxZiHbu8WoYMVMQrCyvsQZzON 6iUvEXg7cW7CU27LzIGMmiJZJ5ESgNg54NhisuBDv8EBIgMHCMioZsRLjWmFdBzV5Ifv KexL+RfK3Z4gCt3h1PBUJyTIFjEjQ5ijIT1q8rs17Qgg08n1eh+qwMGxIme/EzpemwD6 fNyo1nHeOl8Xb/EPbHeiNzFCmmzBTyjybg3ETtThcMtE4viH4hKRBTETox/ZTrO7L+Og nYEt+W0K0D9sbAJiVnPdseBzbLeJQOtuehZhKQoQfz022W2w90jAujgRuk9qeQC4kZZF KbuQ== X-Gm-Message-State: ALoCoQkCD5lQaMXSZ95M5sXBRbTge2yP1+8tVe72pOcB/YbCfjiJZZgs3MGKMw/VRyVAbWSJh9OX X-Received: by 10.180.205.142 with SMTP id lg14mr2500568wic.82.1423041962051; Wed, 04 Feb 2015 01:26:02 -0800 (PST) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id a13sm2346491wic.3.2015.02.04.01.26.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 01:26:01 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Wed, 4 Feb 2015 10:25:19 +0100 Message-Id: <1423041925-26956-15-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423041925-26956-1-git-send-email-olivier.matz@6wind.com> References: <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> <1423041925-26956-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v2 14/20] testpmd: support ipip tunnel in csum forward engine X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 09:26:02 -0000 Add support for IP over IP tunnels. Signed-off-by: Olivier Matz --- app/test-pmd/cmdline.c | 2 +- app/test-pmd/csumonly.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b19869c..fc08183 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -324,7 +324,7 @@ static void cmd_help_long_parsed(void *parsed_result, " ip|udp|tcp|sctp always concern the inner layer.\n" " outer-ip concerns the outer IP layer in" " case the packet is recognized as a tunnel packet by" - " the forward engine (vxlan and gre are supported)\n" + " the forward engine (vxlan, gre and ipip are supported)\n" " Please check the NIC datasheet for HW limits.\n\n" "csum parse-tunnel (on|off) (tx_port_id)\n" diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 6623704..88f7696 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -278,6 +278,35 @@ parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info) info->l2_len += sizeof(struct simple_gre_hdr); } + +/* Parse an encapsulated ip or ipv6 header */ +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; + uint8_t ip_version; + + ip_version = (ipv4_hdr->version_ihl & 0xf0) >> 4; + + if (ip_version != 4 && ip_version != 6) + return; + + info->is_tunnel = 1; + info->outer_ethertype = info->ethertype; + info->outer_l2_len = info->l2_len; + info->outer_l3_len = info->l3_len; + + if (ip_version == 4) { + parse_ipv4(ipv4_hdr, info); + info->ethertype = _htons(ETHER_TYPE_IPv4); + } else { + parse_ipv6(ipv6_hdr, info); + info->ethertype = _htons(ETHER_TYPE_IPv6); + } + info->l2_len = 0; +} + /* modify the IPv4 or IPv4 source address of a packet */ static void change_ip_addresses(void *l3_hdr, uint16_t ethertype) @@ -430,6 +459,7 @@ uint16_t testpmd_ol_flags) * 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 * * The testpmd command line for this forward engine sets the flags * TESTPMD_TX_OFFLOAD_* in ports[tx_port].tx_ol_flags. They control @@ -511,14 +541,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) gre_hdr = (struct simple_gre_hdr *) ((char *)l3_hdr + info.l3_len); parse_gre(gre_hdr, &info); + } else if (info.l4_proto == IPPROTO_IPIP) { + void *encap_ip_hdr; + encap_ip_hdr = (char *)l3_hdr + info.l3_len; + parse_encap_ip(encap_ip_hdr, &info); } } - info.l4_proto == IPPROTO_GRE) { - struct simple_gre_hdr *gre_hdr; - gre_hdr = (struct simple_gre_hdr *)((char *)l3_hdr + - info.l3_len); - parse_gre(gre_hdr, &info); - } /* update l3_hdr and outer_l3_hdr if a tunnel was parsed */ if (info.is_tunnel) { -- 2.1.4