From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 512F01BD5F for ; Thu, 12 Apr 2018 14:01:52 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id x82so9138359wmg.1 for ; Thu, 12 Apr 2018 05:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=UQNyrTb86bB843DWgvWwFu9LWNBpjM33s89mGNlhh7I=; b=UL8MAElzO9aLTKGu5NZVWdqUsx3SX5OB2PlJfIZxcy2szRtfA4SF7piXf06qgFrn4D cbCUgV3kkBKk9eFu7++TvnoGoiYL6QMeAMZQhc/5zfZnPN3M0rAYGzW/FtGlxzVQP+29 Z3se4zHQjqAjvErZugNj46kNChRW5IQNk4gSuML9TMB/WYwKT+eR9G+KXx+Zjtb1P2VF RtxPahySLOKUGl7qNqfZmHEDxTHX+WLKS+GQq1QYywfdEX5F4/vgDAUZDRZ05tl/IURp lN9wDrLCGAa74cSRfv4MLg3IZDJ8MGRrklxMCumHhrP3HDModi6w0pqK6QM00GYWDavX qmqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=UQNyrTb86bB843DWgvWwFu9LWNBpjM33s89mGNlhh7I=; b=UegJzXLNnHAkwRbTYkQMeUlnCZkVZt6asA6tUojHZX8mZ05n7p2XE3/aEWPT8rh37A Jh4disw7YVUqaQYJGiCqbPoShxffRXHWC0KAC5ZWasvxp0tWCsd6Rb1pIjrIsAA2Byey qXmzltSemiRcqkW+ySyFUbH2J8+hZ6UaQz6A2sOkaj95/M1+qrTVFM8ttKvXsPAjx2jW P67KEsVNag/+sWYd90tlqns08J5plOMUyN8nrlh88QYGOV0yGls4GghJpz6CQOFGD+Tk ibpstSBkdfZ9dQJnjaIVSzst+Lzqii9tpDKBXzDTOFaNVRVfYn9xFEPQj/W6QmEp6JPR 9x5w== X-Gm-Message-State: ALQs6tCBO6n4CKtvri64imXXQYa8xBTmZaV+9unR5poFntItkQvNf1dJ y6iM99Oa5USWH/7ooc01RAm24g== X-Google-Smtp-Source: AIpwx4/IeLOqusl9DB0I+DBnJ+IKnQyW2P9fBSrSkOZLSpM6Kre5VFhnCuM4HkqveRPQgVqD+ffXCA== X-Received: by 10.28.7.133 with SMTP id 127mr496757wmh.74.1523534510039; Thu, 12 Apr 2018 05:01:50 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id z11sm3045167wre.15.2018.04.12.05.01.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Apr 2018 05:01:49 -0700 (PDT) Date: Thu, 12 Apr 2018 14:01:36 +0200 From: Adrien Mazarguil To: Xueming Li Cc: Wenzhuo Lu , Jingjing Wu , Thomas Monjalon , Nelio Laranjeiro , Shahaf Shuler , dev@dpdk.org, Olivier Matz Message-ID: <20180412120135.GS4957@6wind.com> References: <20180226150947.107179-2-xuemingl@mellanox.com> <20180412073324.61972-5-xuemingl@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180412073324.61972-5-xuemingl@mellanox.com> Subject: Re: [dpdk-dev] [PATCH v3 4/5] app/testpmd: introduce new tunnel VXLAN-GPE X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2018 12:01:52 -0000 On Thu, Apr 12, 2018 at 03:33:23PM +0800, Xueming Li wrote: > Add VXLAN-GPE support to csum forwarding engine and rte flow. > > Signed-off-by: Xueming Li This commit still misses testpmd documentation for the new flow command parameters ("Pattern items" section in doc/guides/testpmd_app_ug/testpmd_funcs.rst). Once addressed, as far as rte_flow is concerned (I did not review the csum engine nor other configuration changes): Acked-by: Adrien Mazarguil > --- > app/test-pmd/cmdline_flow.c | 24 ++++++++++ > app/test-pmd/config.c | 2 + > app/test-pmd/csumonly.c | 83 +++++++++++++++++++++++++++++++++-- > app/test-pmd/parameters.c | 12 ++++- > app/test-pmd/testpmd.h | 2 + > doc/guides/testpmd_app_ug/run_app.rst | 5 +++ > 6 files changed, 124 insertions(+), 4 deletions(-) > > diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c > index f85c1c57f..0d3c62599 100644 > --- a/app/test-pmd/cmdline_flow.c > +++ b/app/test-pmd/cmdline_flow.c > @@ -154,6 +154,8 @@ enum index { > ITEM_GENEVE, > ITEM_GENEVE_VNI, > ITEM_GENEVE_PROTO, > + ITEM_VXLAN_GPE, > + ITEM_VXLAN_GPE_VNI, > > /* Validate/create actions. */ > ACTIONS, > @@ -470,6 +472,7 @@ static const enum index next_item[] = { > ITEM_GTPC, > ITEM_GTPU, > ITEM_GENEVE, > + ITEM_VXLAN_GPE, > ZERO, > }; > > @@ -626,6 +629,12 @@ static const enum index item_geneve[] = { > ZERO, > }; > > +static const enum index item_vxlan_gpe[] = { > + ITEM_VXLAN_GPE_VNI, > + ITEM_NEXT, > + ZERO, > +}; > + > static const enum index next_action[] = { > ACTION_END, > ACTION_VOID, > @@ -1560,6 +1569,21 @@ static const struct token token_list[] = { > .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve, > protocol)), > }, > + [ITEM_VXLAN_GPE] = { > + .name = "vxlan-gpe", > + .help = "match VXLAN-GPE header", > + .priv = PRIV_ITEM(VXLAN_GPE, > + sizeof(struct rte_flow_item_vxlan_gpe)), > + .next = NEXT(item_vxlan_gpe), > + .call = parse_vc, > + }, > + [ITEM_VXLAN_GPE_VNI] = { > + .name = "vni", > + .help = "VXLAN-GPE identifier", > + .next = NEXT(item_vxlan_gpe, NEXT_ENTRY(UNSIGNED), item_param), > + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan_gpe, > + vni)), > + }, > > /* Validate/create actions. */ > [ACTIONS] = { > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c > index 4a273eff7..349eb9015 100644 > --- a/app/test-pmd/config.c > +++ b/app/test-pmd/config.c > @@ -981,6 +981,7 @@ static const struct { > MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)), > MK_FLOW_ITEM(GTPU, sizeof(struct rte_flow_item_gtp)), > MK_FLOW_ITEM(GENEVE, sizeof(struct rte_flow_item_geneve)), > + MK_FLOW_ITEM(VXLAN_GPE, sizeof(struct rte_flow_item_vxlan_gpe)), > }; > > /** Pattern item specification types. */ > @@ -3082,6 +3083,7 @@ flowtype_to_str(uint16_t flow_type) > {"vxlan", RTE_ETH_FLOW_VXLAN}, > {"geneve", RTE_ETH_FLOW_GENEVE}, > {"nvgre", RTE_ETH_FLOW_NVGRE}, > + {"vxlan-gpe", RTE_ETH_FLOW_VXLAN_GPE}, > }; > > for (i = 0; i < RTE_DIM(flowtype_str_table); i++) { > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c > index 5f5ab64aa..d98c51648 100644 > --- a/app/test-pmd/csumonly.c > +++ b/app/test-pmd/csumonly.c > @@ -60,6 +60,8 @@ > #define _htons(x) (x) > #endif > > +uint16_t vxlan_gpe_udp_port = 4790; > + > /* structure that caches offload info for the current packet */ > struct testpmd_offload_info { > uint16_t ethertype; > @@ -194,6 +196,70 @@ parse_vxlan(struct udp_hdr *udp_hdr, > info->l2_len += ETHER_VXLAN_HLEN; /* add udp + vxlan */ > } > > +/* Parse a vxlan-gpe header */ > +static void > +parse_vxlan_gpe(struct udp_hdr *udp_hdr, > + struct testpmd_offload_info *info) > +{ > + struct ether_hdr *eth_hdr; > + struct ipv4_hdr *ipv4_hdr; > + struct ipv6_hdr *ipv6_hdr; > + struct vxlan_gpe_hdr *vxlan_gpe_hdr; > + uint8_t vxlan_gpe_len = sizeof(*vxlan_gpe_hdr); > + > + /* Check udp destination port. */ > + if (udp_hdr->dst_port != _htons(vxlan_gpe_udp_port)) > + return; > + > + vxlan_gpe_hdr = (struct vxlan_gpe_hdr *)((char *)udp_hdr + > + sizeof(struct udp_hdr)); > + > + if (!vxlan_gpe_hdr->proto || vxlan_gpe_hdr->proto == > + VXLAN_GPE_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 *)vxlan_gpe_hdr + > + vxlan_gpe_len); > + > + parse_ipv4(ipv4_hdr, info); > + info->ethertype = _htons(ETHER_TYPE_IPv4); > + info->l2_len = 0; > + > + } else if (vxlan_gpe_hdr->proto == VXLAN_GPE_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 *)vxlan_gpe_hdr + > + vxlan_gpe_len); > + > + info->ethertype = _htons(ETHER_TYPE_IPv6); > + parse_ipv6(ipv6_hdr, info); > + info->l2_len = 0; > + > + } else if (vxlan_gpe_hdr->proto == VXLAN_GPE_TYPE_ETH) { > + 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; > + > + eth_hdr = (struct ether_hdr *)((char *)vxlan_gpe_hdr + > + vxlan_gpe_len); > + > + parse_ethernet(eth_hdr, info); > + } else > + return; > + > + info->l2_len += ETHER_VXLAN_GPE_HLEN; > +} > + > /* Parse a gre header */ > static void > parse_gre(struct simple_gre_hdr *gre_hdr, struct testpmd_offload_info *info) > @@ -588,6 +654,10 @@ pkt_copy_split(const struct rte_mbuf *pkt) > * 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 / outer UDP / VXLAN-GPE / Ether / IP|IP6 / > + * UDP|TCP|SCTP > + * Ether / (vlan) / outer IP|IP6 / outer UDP / VXLAN-GPE / 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 > * Ether / (vlan) / outer IP|IP6 / IP|IP6 / UDP|TCP|SCTP > @@ -691,9 +761,16 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) > > udp_hdr = (struct udp_hdr *)((char *)l3_hdr + > info.l3_len); > - parse_vxlan(udp_hdr, &info, m->packet_type); > - if (info.is_tunnel) > - tx_ol_flags |= PKT_TX_TUNNEL_VXLAN; > + parse_vxlan_gpe(udp_hdr, &info); > + if (info.is_tunnel) { > + tx_ol_flags |= PKT_TX_TUNNEL_VXLAN_GPE; > + } else { > + parse_vxlan(udp_hdr, &info, > + m->packet_type); > + if (info.is_tunnel) > + tx_ol_flags |= > + PKT_TX_TUNNEL_VXLAN; > + } > } else if (info.l4_proto == IPPROTO_GRE) { > struct simple_gre_hdr *gre_hdr; > > diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c > index 2192bdcdf..68063b7a4 100644 > --- a/app/test-pmd/parameters.c > +++ b/app/test-pmd/parameters.c > @@ -70,7 +70,7 @@ usage(char* progname) > "--rss-ip | --rss-udp | " > "--rxpt= | --rxht= | --rxwt= | --rxfreet= | " > "--txpt= | --txht= | --txwt= | --txfreet= | " > - "--txrst= | --tx-offloads ]\n", > + "--txrst= | --tx-offloads= | --vxlan-gpe-port= ]\n", > progname); > #ifdef RTE_LIBRTE_CMDLINE > printf(" --interactive: run in interactive mode.\n"); > @@ -186,6 +186,7 @@ usage(char* progname) > printf(" --flow-isolate-all: " > "requests flow API isolated mode on all ports at initialization time.\n"); > printf(" --tx-offloads=0xXXXXXXXX: hexadecimal bitmask of TX queue offloads\n"); > + printf(" --vxlan-gpe-port=N: UPD port of tunnel VXLAN-GPE\n"); > } > > #ifdef RTE_LIBRTE_CMDLINE > @@ -621,6 +622,7 @@ launch_args_parse(int argc, char** argv) > { "print-event", 1, 0, 0 }, > { "mask-event", 1, 0, 0 }, > { "tx-offloads", 1, 0, 0 }, > + { "vxlan-gpe-port", 1, 0, 0 }, > { 0, 0, 0, 0 }, > }; > > @@ -1091,6 +1093,14 @@ launch_args_parse(int argc, char** argv) > rte_exit(EXIT_FAILURE, > "tx-offloads must be >= 0\n"); > } > + if (!strcmp(lgopts[opt_idx].name, "vxlan-gpe-port")) { > + n = atoi(optarg); > + if (n >= 0) > + vxlan_gpe_udp_port = (uint16_t)n; > + else > + rte_exit(EXIT_FAILURE, > + "vxlan-gpe-port must be >= 0\n"); > + } > if (!strcmp(lgopts[opt_idx].name, "print-event")) > if (parse_event_printing_config(optarg, 1)) { > rte_exit(EXIT_FAILURE, > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h > index 593ae2160..b270602d9 100644 > --- a/app/test-pmd/testpmd.h > +++ b/app/test-pmd/testpmd.h > @@ -446,6 +446,8 @@ extern uint32_t retry_enabled; > extern struct fwd_lcore **fwd_lcores; > extern struct fwd_stream **fwd_streams; > > +extern uint16_t vxlan_gpe_udp_port; /**< UDP port of tunnel VXLAN-GPE. */ > + > extern portid_t nb_peer_eth_addrs; /**< Number of peer ethernet addresses. */ > extern struct ether_addr peer_eth_addrs[RTE_MAX_ETHPORTS]; > > diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst > index 1fd53958a..2e8690f41 100644 > --- a/doc/guides/testpmd_app_ug/run_app.rst > +++ b/doc/guides/testpmd_app_ug/run_app.rst > @@ -479,3 +479,8 @@ The commandline options are: > > Set the hexadecimal bitmask of TX queue offloads. > The default value is 0. > + > +* ``--vxlan-gpe-port=N`` > + > + Set the UDP port number of tunnel VXLAN-GPE to N. > + The default value is 4790. > -- > 2.13.3 > -- Adrien Mazarguil 6WIND