From patchwork Fri Jan 30 13:16:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 2830 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 5B9F25AA0; Fri, 30 Jan 2015 14:17:27 +0100 (CET) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by dpdk.org (Postfix) with ESMTP id 0641A58CB for ; Fri, 30 Jan 2015 14:16:43 +0100 (CET) Received: by mail-wi0-f173.google.com with SMTP id r20so2973968wiv.0 for ; Fri, 30 Jan 2015 05:16:41 -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=Ed/ejb2+9LJfnZdkKR7lyOVGsiAlBY+8pQB94PPfwSg=; b=gSQ2NEoO7FqlKQjaSvwRUtxHtEC1n18wv5/ze04qEmfULH1rUMUyX0HRK89WSc7qnv XIl2NM7dlWNZNbQfHCwf3WneckBCZIvRpLLJl5YI3Sf1Zlfs3jOQ2tFzYp4LjcbPSpcC cJgTfwds77Y810qUKoz2hh/1sX1xPIouGZv+7Rs2FKISGhPrIIP1Al9YYF7+nVRp3Lhe a2+yonIIf2Foh4zQYGB0bPEfHkTs9+3P8p2V0WBwFCpbfn7TW5e3F5hxI4c+6bxf4hiY bVv4oCefypxsjr+JY9zRr89Yunn91Zgw9eQUsan7J2V3X5g3g7QcfpT5lVjSipXZFIZ0 K6pg== X-Gm-Message-State: ALoCoQlv1uuu4m+rpTkVA09unePQaoT+HPvFPsr08hrU66EcK8D/ME9Bmqn3YDyJdpl+kkdcKhpl X-Received: by 10.194.76.73 with SMTP id i9mr11929128wjw.93.1422623801888; Fri, 30 Jan 2015 05:16:41 -0800 (PST) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id li7sm6911300wic.4.2015.01.30.05.16.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Jan 2015 05:16:41 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Fri, 30 Jan 2015 14:16:09 +0100 Message-Id: <1422623775-8050-15-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> References: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 aa5c178..70ab126 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -323,7 +323,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 02c01f6..407e3b3 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) {