From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id D0481376C for ; Mon, 2 Feb 2015 04:07:09 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 01 Feb 2015 19:02:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,504,1418112000"; d="scan'208";a="679474261" Received: from pgsmsx106.gar.corp.intel.com ([10.221.44.98]) by orsmga002.jf.intel.com with ESMTP; 01 Feb 2015 19:07:07 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.110.14) by PGSMSX106.gar.corp.intel.com (10.221.44.98) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 2 Feb 2015 11:04:34 +0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.253]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.91]) with mapi id 14.03.0195.001; Mon, 2 Feb 2015 11:04:34 +0800 From: "Liu, Jijiang" To: Olivier Matz Thread-Topic: [PATCH 13/20] testpmd: support gre tunnels in csum fwd engine Thread-Index: AQHQPI7+vSJJ3dC510mOiD3It1mmnZzcqwZQ Date: Mon, 2 Feb 2015 03:04:32 +0000 Message-ID: <1ED644BD7E0A5F4091CF203DAFB8E4CC01DC9728@SHSMSX101.ccr.corp.intel.com> References: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> <1422623775-8050-14-git-send-email-olivier.matz@6wind.com> In-Reply-To: <1422623775-8050-14-git-send-email-olivier.matz@6wind.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH 13/20] 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: , X-List-Received-Date: Mon, 02 Feb 2015 03:07:10 -0000 Hi Olivier, > -----Original Message----- > From: Olivier Matz [mailto:olivier.matz@6wind.com] > Sent: Friday, January 30, 2015 9:16 PM > To: dev@dpdk.org > Cc: Ananyev, Konstantin; Liu, Jijiang; Zhang, Helin; olivier.matz@6wind.c= om > Subject: [PATCH 13/20] testpmd: support gre tunnels in csum fwd engine >=20 > Add support for Ethernet over GRE and IP over GRE tunnels. >=20 > Signed-off-by: Olivier Matz > --- > app/test-pmd/cmdline.c | 6 ++-- > app/test-pmd/csumonly.c | 87 > +++++++++++++++++++++++++++++++++++++++++++++---- > 2 files changed, 84 insertions(+), 9 deletions(-) >=20 > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index > 98f7a1c..aa5c178 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" >=20 > "csum parse-tunnel (on|off) (tx_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; > }; >=20 > +/* simplified GRE header (flags must be 0) */ struct simple_gre_hdr { > + uint16_t flags; > + uint16_t proto; > +}; I suggest you to remove the comment ' flags must be 0'=1B$B!$=1B(Bthe reaso= n is that we just use the header structure to check what the protocol is. It is not necessary to require the flag must be 0. > 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 +=3D ETHER_VXLAN_HLEN; /* add udp + vxlan */ } >=20 > +/* 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 !=3D 0; it's not supported */ > + if (gre_hdr->flags !=3D 0) > + return; I suggest you remove the check here, you can add some comments in front of = this function to explain that actual NVGRE and IP over GRE is not supported= now. For example, when I want to support NVGRE TX checksum offload, I will do th= e following change. Or you still keep it here, but anyway, I will change it later. > + > + if (gre_hdr->proto =3D=3D _htons(ETHER_TYPE_IPv4)) { > + info->is_tunnel =3D 1; > + info->outer_ethertype =3D info->ethertype; > + info->outer_l2_len =3D info->l2_len; > + info->outer_l3_len =3D info->l3_len; > + > + ipv4_hdr =3D (struct ipv4_hdr *)((char *)gre_hdr + > + sizeof(struct simple_gre_hdr)); > + > + parse_ipv4(ipv4_hdr, info); > + info->ethertype =3D _htons(ETHER_TYPE_IPv4); > + info->l2_len =3D 0; > + > + } else if (gre_hdr->proto =3D=3D _htons(ETHER_TYPE_IPv6)) { > + info->is_tunnel =3D 1; > + info->outer_ethertype =3D info->ethertype; > + info->outer_l2_len =3D info->l2_len; > + info->outer_l3_len =3D info->l3_len; > + > + ipv6_hdr =3D (struct ipv6_hdr *)((char *)gre_hdr + > + sizeof(struct simple_gre_hdr)); > + > + info->ethertype =3D _htons(ETHER_TYPE_IPv6); > + parse_ipv6(ipv6_hdr, info); > + info->l2_len =3D 0; > + > + } else if (gre_hdr->proto =3D=3D _htons(0x6558)) { /* ETH_P_TEB in linu= x > */ > + info->is_tunnel =3D 1; > + info->outer_ethertype =3D info->ethertype; > + info->outer_l2_len =3D info->l2_len; > + info->outer_l3_len =3D info->l3_len; > + > + eth_hdr =3D (struct ether_hdr *)((char *)gre_hdr + > + sizeof(struct simple_gre_hdr)); For NVGRE: I will do some change here. eth_hdr =3D (struct ether_hdr *)((char *)gre_hdr + sizeof(struct nvgre_hdr)); // replace simple_gre_hdr with nvgre_hdr. > + parse_ethernet(eth_hdr, info); > + } else > + return; > + > + info->l2_len +=3D 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 =3D (char *)eth_hdr + info.l2_len; >=20 > - /* check if it's a supported tunnel (only vxlan for now) */ > - if ((testpmd_ol_flags & > TESTPMD_TX_OFFLOAD_PARSE_TUNNEL) && > - info.l4_proto =3D=3D IPPROTO_UDP) { > - struct udp_hdr *udp_hdr; > - udp_hdr =3D (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 =3D=3D IPPROTO_UDP) { > + struct udp_hdr *udp_hdr; > + udp_hdr =3D (struct udp_hdr *)((char *)l3_hdr > + > + info.l3_len); > + parse_vxlan(udp_hdr, &info, m->ol_flags); > + } else if (info.l4_proto =3D=3D IPPROTO_GRE) { > + struct simple_gre_hdr *gre_hdr; > + gre_hdr =3D (struct simple_gre_hdr *) > + ((char *)l3_hdr + info.l3_len); > + parse_gre(gre_hdr, &info); > + } > + } > + info.l4_proto =3D=3D IPPROTO_GRE) { > + struct simple_gre_hdr *gre_hdr; > + gre_hdr =3D (struct simple_gre_hdr *)((char *)l3_hdr + > + info.l3_len); > + parse_gre(gre_hdr, &info); > } >=20 > /* update l3_hdr and outer_l3_hdr if a tunnel was parsed */ > -- > 2.1.4