From patchwork Wed Jan 21 23:36:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 2454 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 20BB75ADB; Thu, 22 Jan 2015 00:37:16 +0100 (CET) Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by dpdk.org (Postfix) with ESMTP id 697105ACA for ; Thu, 22 Jan 2015 00:37:05 +0100 (CET) Received: by mail-we0-f173.google.com with SMTP id w62so5532843wes.4 for ; Wed, 21 Jan 2015 15:37:05 -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=ykYJBYWF6PGd05lYO9ZpTcxBYZFy0Mt+ckR4L2bXisM=; b=AbVH+YEwaqCtiCwYaRjWnKGr0vCFSyjQUVBxVih9tyvkU1ad9+326YJpL1Me8Txns8 Z1cUZ4efd0otS5orTXwOfFHh/xPt4hTOtHkAoijc+MINGKO51A43efei2qYRdARRnOfJ seHzzwtNmW2wABZOIxWVrI6Yv70rvltLlZ08dbeKEa1TmwLzDg6UKvd8KQ/Mlnc6vXf+ DjLMlmNkutXBxOmGTvn13ZFgxuraPUyAl++HddWNmH2/wybkX1AhWXa+GaD4bOGTD48H xnbcPi6ejVnOENKel5ck9fJHqN40jQ+0x8NOYzQ6NIHX3ODW8tPn2Ofpo644L/jTjXGK OzIQ== X-Gm-Message-State: ALoCoQkqQ4PUP7k+pulmh7b233P3yXo/R8qI5mwBCv5voA/BJE8BMqHX8JRfPVa5CsBgm8PcRejl X-Received: by 10.194.203.199 with SMTP id ks7mr85606196wjc.105.1421883425305; Wed, 21 Jan 2015 15:37:05 -0800 (PST) Received: from glumotte.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id wa5sm1710761wjc.8.2015.01.21.15.36.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jan 2015 15:37:00 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Thu, 22 Jan 2015 00:36:34 +0100 Message-Id: <1421883395-27235-16-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> References: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [RFC 15/16] testpmd: support gre tunnels in csum fwd 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 Ethernet over GRE and IP over GRE tunnels. Signed-off-by: Olivier Matz --- app/test-pmd/cmdline.c | 6 ++-- app/test-pmd/csumonly.c | 87 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 451c728..9304207 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -321,9 +321,9 @@ static void cmd_help_long_parsed(void *parsed_result, " checksum with when transmitting a packet using the" " csum forward engine.\n" " 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 vxlan packet by" - " the forward engine)\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" " Please check the NIC datasheet for HW limits.\n\n" "csum parse-tunnel (on|off) (port_id)\n" diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 52af0e7..02c01f6 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -100,6 +100,12 @@ struct testpmd_offload_info { uint16_t tso_segsz; }; +/* simplified GRE header (flags must be 0) */ +struct simple_gre_hdr { + uint16_t flags; + uint16_t proto; +}; + static uint16_t get_psd_sum(void *l3_hdr, uint16_t ethertype, uint64_t ol_flags) { @@ -218,6 +224,60 @@ parse_vxlan(struct udp_hdr *udp_hdr, struct testpmd_offload_info *info, info->l2_len += ETHER_VXLAN_HLEN; /* add udp + vxlan */ } +/* Parse a gre header */ +static void +parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info) +{ + struct ether_hdr *eth_hdr; + struct ipv4_hdr *ipv4_hdr; + struct ipv6_hdr *ipv6_hdr; + + /* if flags != 0; it's not supported */ + if (gre_hdr->flags != 0) + return; + + if (gre_hdr->proto == _htons(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; + + ipv4_hdr = (struct ipv4_hdr *)((char *)gre_hdr + + sizeof(struct simple_gre_hdr)); + + parse_ipv4(ipv4_hdr, info); + info->ethertype = _htons(ETHER_TYPE_IPv4); + info->l2_len = 0; + + } else if (gre_hdr->proto == _htons(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; + + ipv6_hdr = (struct ipv6_hdr *)((char *)gre_hdr + + sizeof(struct simple_gre_hdr)); + + info->ethertype = _htons(ETHER_TYPE_IPv6); + parse_ipv6(ipv6_hdr, info); + info->l2_len = 0; + + } else if (gre_hdr->proto == _htons(0x6558)) { /* ETH_P_TEB in linux */ + info->is_tunnel = 1; + info->outer_ethertype = info->ethertype; + info->outer_l2_len = info->l2_len; + info->outer_l3_len = info->l3_len; + + eth_hdr = (struct ether_hdr *)((char *)gre_hdr + + sizeof(struct simple_gre_hdr)); + + parse_ethernet(eth_hdr, info); + } else + return; + + info->l2_len += sizeof(struct simple_gre_hdr); +} + /* modify the IPv4 or IPv4 source address of a packet */ static void change_ip_addresses(void *l3_hdr, uint16_t ethertype) @@ -368,6 +428,8 @@ uint16_t testpmd_ol_flags) * Ether / (vlan) / IP|IP6 / UDP|TCP|SCTP . * Ether / (vlan) / outer IP|IP6 / outer UDP / VxLAN / Ether / 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 * * The testpmd command line for this forward engine sets the flags * TESTPMD_TX_OFFLOAD_* in ports[tx_port].tx_ol_flags. They control @@ -437,12 +499,25 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) parse_ethernet(eth_hdr, &info); l3_hdr = (char *)eth_hdr + info.l2_len; - /* check if it's a supported tunnel (only vxlan for now) */ - if ((testpmd_ol_flags & TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) && - info.l4_proto == IPPROTO_UDP) { - struct udp_hdr *udp_hdr; - udp_hdr = (struct udp_hdr *)((char *)l3_hdr + info.l3_len); - parse_vxlan(udp_hdr, &info, m->ol_flags); + /* check if it's a supported tunnel */ + if (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) { + if (info.l4_proto == IPPROTO_UDP) { + struct udp_hdr *udp_hdr; + udp_hdr = (struct udp_hdr *)((char *)l3_hdr + + info.l3_len); + parse_vxlan(udp_hdr, &info, m->ol_flags); + } else if (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); + } + } + 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 */