From: "Nélio Laranjeiro" <nelio.laranjeiro@6wind.com>
To: Xueming Li <xuemingl@mellanox.com>
Cc: Shahaf Shuler <shahafs@mellanox.com>, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v3 09/14] net/mlx5: introduce VXLAN-GPE tunnel type
Date: Fri, 13 Apr 2018 15:32:01 +0200 [thread overview]
Message-ID: <20180413133201.me2murq4kgdcp4xy@laranjeiro-vm.dev.6wind.com> (raw)
In-Reply-To: <20180413112023.106420-10-xuemingl@mellanox.com>
Small nit,
On Fri, Apr 13, 2018 at 07:20:18PM +0800, Xueming Li wrote:
> Add VXLAN-GPE support to rte flow.
Duplicating the title in the body seems not useful ;)
>
> Signed-off-by: Xueming Li <xuemingl@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_flow.c | 95 +++++++++++++++++++++++++++++++++++++++++++-
> drivers/net/mlx5/mlx5_rxtx.c | 3 +-
> 2 files changed, 95 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index c99722770..19973b13c 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -91,6 +91,11 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item,
> struct mlx5_flow_data *data);
>
> static int
> +mlx5_flow_create_vxlan_gpe(const struct rte_flow_item *item,
> + const void *default_mask,
> + struct mlx5_flow_data *data);
> +
> +static int
> mlx5_flow_create_gre(const struct rte_flow_item *item,
> const void *default_mask,
> struct mlx5_flow_data *data);
> @@ -241,10 +246,12 @@ struct rte_flow {
>
> #define IS_TUNNEL(type) ( \
> (type) == RTE_FLOW_ITEM_TYPE_VXLAN || \
> + (type) == RTE_FLOW_ITEM_TYPE_VXLAN_GPE || \
> (type) == RTE_FLOW_ITEM_TYPE_GRE)
>
> const uint32_t flow_ptype[] = {
> [RTE_FLOW_ITEM_TYPE_VXLAN] = RTE_PTYPE_TUNNEL_VXLAN,
> + [RTE_FLOW_ITEM_TYPE_VXLAN_GPE] = RTE_PTYPE_TUNNEL_VXLAN_GPE,
> [RTE_FLOW_ITEM_TYPE_GRE] = RTE_PTYPE_TUNNEL_GRE,
> };
>
> @@ -253,6 +260,8 @@ const uint32_t flow_ptype[] = {
> const uint32_t ptype_ext[] = {
> [PTYPE_IDX(RTE_PTYPE_TUNNEL_VXLAN)] = RTE_PTYPE_TUNNEL_VXLAN |
> RTE_PTYPE_L4_UDP,
> + [PTYPE_IDX(RTE_PTYPE_TUNNEL_VXLAN_GPE)] = RTE_PTYPE_TUNNEL_VXLAN_GPE |
> + RTE_PTYPE_L4_UDP,
> [PTYPE_IDX(RTE_PTYPE_TUNNEL_GRE)] = RTE_PTYPE_TUNNEL_GRE,
> };
>
> @@ -310,6 +319,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = {
> [RTE_FLOW_ITEM_TYPE_END] = {
> .items = ITEMS(RTE_FLOW_ITEM_TYPE_ETH,
> RTE_FLOW_ITEM_TYPE_VXLAN,
> + RTE_FLOW_ITEM_TYPE_VXLAN_GPE,
> RTE_FLOW_ITEM_TYPE_GRE),
> },
> [RTE_FLOW_ITEM_TYPE_ETH] = {
> @@ -388,7 +398,8 @@ static const struct mlx5_flow_items mlx5_flow_items[] = {
> .dst_sz = sizeof(struct ibv_flow_spec_ipv6),
> },
> [RTE_FLOW_ITEM_TYPE_UDP] = {
> - .items = ITEMS(RTE_FLOW_ITEM_TYPE_VXLAN),
> + .items = ITEMS(RTE_FLOW_ITEM_TYPE_VXLAN,
> + RTE_FLOW_ITEM_TYPE_VXLAN_GPE),
> .actions = valid_actions,
> .mask = &(const struct rte_flow_item_udp){
> .hdr = {
> @@ -440,6 +451,19 @@ static const struct mlx5_flow_items mlx5_flow_items[] = {
> .convert = mlx5_flow_create_vxlan,
> .dst_sz = sizeof(struct ibv_flow_spec_tunnel),
> },
> + [RTE_FLOW_ITEM_TYPE_VXLAN_GPE] = {
> + .items = ITEMS(RTE_FLOW_ITEM_TYPE_ETH,
> + RTE_FLOW_ITEM_TYPE_IPV4,
> + RTE_FLOW_ITEM_TYPE_IPV6),
> + .actions = valid_actions,
> + .mask = &(const struct rte_flow_item_vxlan_gpe){
> + .vni = "\xff\xff\xff",
> + },
> + .default_mask = &rte_flow_item_vxlan_gpe_mask,
> + .mask_sz = sizeof(struct rte_flow_item_vxlan_gpe),
> + .convert = mlx5_flow_create_vxlan_gpe,
> + .dst_sz = sizeof(struct ibv_flow_spec_tunnel),
> + },
> };
>
> /** Structure to pass to the conversion function. */
> @@ -1786,6 +1810,75 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item,
> }
>
> /**
> + * Convert VXLAN-GPE item to Verbs specification.
> + *
> + * @param item[in]
> + * Item specification.
> + * @param default_mask[in]
> + * Default bit-masks to use when item->mask is not provided.
> + * @param data[in, out]
> + * User structure.
> + *
> + * @return
> + * 0 on success, a negative errno value otherwise and rte_errno is set.
> + */
> +static int
> +mlx5_flow_create_vxlan_gpe(const struct rte_flow_item *item,
> + const void *default_mask,
> + struct mlx5_flow_data *data)
> +{
> + const struct rte_flow_item_vxlan_gpe *spec = item->spec;
> + const struct rte_flow_item_vxlan_gpe *mask = item->mask;
> + struct mlx5_flow_parse *parser = data->parser;
> + unsigned int size = sizeof(struct ibv_flow_spec_tunnel);
> + struct ibv_flow_spec_tunnel vxlan = {
> + .type = parser->inner | IBV_FLOW_SPEC_VXLAN_TUNNEL,
> + .size = size,
> + };
> + union vni {
> + uint32_t vlan_id;
> + uint8_t vni[4];
> + } id;
> + int r;
> +
> + id.vni[0] = 0;
> + parser->inner = IBV_FLOW_SPEC_INNER;
> + parser->tunnel = ptype_ext[PTYPE_IDX(RTE_PTYPE_TUNNEL_VXLAN_GPE)];
> + parser->out_layer = parser->layer;
> + parser->layer = HASH_RXQ_TUNNEL;
> + if (spec) {
> + if (!mask)
> + mask = default_mask;
> + memcpy(&id.vni[1], spec->vni, 3);
> + vxlan.val.tunnel_id = id.vlan_id;
> + memcpy(&id.vni[1], mask->vni, 3);
> + vxlan.mask.tunnel_id = id.vlan_id;
> + if (spec->protocol) {
> + r = EINVAL;
> + return r;
rte_errno is not set and the returned value is positive.
> + }
> + /* Remove unwanted bits from values. */
> + vxlan.val.tunnel_id &= vxlan.mask.tunnel_id;
> + }
> + /*
> + * Tunnel id 0 is equivalent as not adding a VXLAN layer, if only this
> + * layer is defined in the Verbs specification it is interpreted as
> + * wildcard and all packets will match this rule, if it follows a full
> + * stack layer (ex: eth / ipv4 / udp), all packets matching the layers
> + * before will also match this rule.
> + * To avoid such situation, VNI 0 is currently refused.
> + */
> + /* Only allow tunnel w/o tunnel id pattern after proper outer spec. */
> + if (parser->out_layer == HASH_RXQ_ETH && !vxlan.val.tunnel_id)
> + return rte_flow_error_set(data->error, EINVAL,
> + RTE_FLOW_ERROR_TYPE_ITEM,
> + item,
> + "VxLAN-GPE vni cannot be 0");
> + mlx5_flow_create_copy(parser, &vxlan, size);
> + return 0;
> +}
> +
> +/**
> * Convert GRE item to Verbs specification.
> *
> * @param item[in]
> diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
> index 285b2dbf0..c9342d659 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.c
> +++ b/drivers/net/mlx5/mlx5_rxtx.c
> @@ -466,8 +466,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
> uint8_t vlan_sz =
> (buf->ol_flags & PKT_TX_VLAN_PKT) ? 4 : 0;
> const uint64_t is_tunneled =
> - buf->ol_flags & (PKT_TX_TUNNEL_GRE |
> - PKT_TX_TUNNEL_VXLAN);
> + buf->ol_flags & (PKT_TX_TUNNEL_MASK);
>
> tso_header_sz = buf->l2_len + vlan_sz +
> buf->l3_len + buf->l4_len;
> --
> 2.13.3
>
Thanks,
--
Nélio Laranjeiro
6WIND
next prev parent reply other threads:[~2018-04-13 13:31 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180410133415.189905-1-xuemingl%40mellanox.com>
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 00/14] mlx5 Rx tunnel offloading Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 00/11] " Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 " Xueming Li
2018-04-23 12:32 ` [dpdk-dev] [PATCH v6 " Xueming Li
2018-04-24 8:24 ` Nélio Laranjeiro
2018-04-24 8:25 ` Xueming(Steven) Li
2018-04-26 6:23 ` Shahaf Shuler
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 01/11] net/mlx5: support 16 hardware priorities Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 02/11] net/mlx5: support GRE tunnel flow Xueming Li
2018-04-23 12:55 ` Nélio Laranjeiro
2018-04-23 13:32 ` Xueming(Steven) Li
2018-04-23 13:46 ` Nélio Laranjeiro
2018-04-24 7:40 ` Xueming(Steven) Li
2018-04-24 8:21 ` Nélio Laranjeiro
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 03/11] net/mlx5: support L3 VXLAN flow Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 04/11] net/mlx5: support Rx tunnel type identification Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 05/11] net/mlx5: cleanup tunnel checksum offloads Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 06/11] net/mlx5: split flow RSS handling logic Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 07/11] net/mlx5: support tunnel RSS level Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 08/11] net/mlx5: add hardware flow debug dump Xueming Li
2018-04-26 10:09 ` Ferruh Yigit
2018-04-26 10:48 ` Shahaf Shuler
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 09/11] net/mlx5: introduce VXLAN-GPE tunnel type Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 10/11] net/mlx5: allow flow tunnel ID 0 with outer pattern Xueming Li
2018-04-23 12:33 ` [dpdk-dev] [PATCH v6 11/11] doc: update mlx5 guide on tunnel offloading Xueming Li
2018-04-26 11:00 ` Ferruh Yigit
2018-04-26 14:03 ` Xueming(Steven) Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 01/11] net/mlx5: support 16 hardware priorities Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 02/11] net/mlx5: support GRE tunnel flow Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 03/11] net/mlx5: support L3 VXLAN flow Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 04/11] net/mlx5: support Rx tunnel type identification Xueming Li
2018-04-23 7:40 ` Nélio Laranjeiro
2018-04-23 7:56 ` Xueming(Steven) Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 05/11] net/mlx5: cleanup tunnel checksum offloads Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 06/11] net/mlx5: split flow RSS handling logic Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 07/11] net/mlx5: support tunnel RSS level Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 08/11] net/mlx5: add hardware flow debug dump Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 09/11] net/mlx5: introduce VXLAN-GPE tunnel type Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 10/11] net/mlx5: allow flow tunnel ID 0 with outer pattern Xueming Li
2018-04-20 12:23 ` [dpdk-dev] [PATCH v5 11/11] doc: update mlx5 guide on tunnel offloading Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 01/11] net/mlx5: support 16 hardware priorities Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 02/11] net/mlx5: support GRE tunnel flow Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 03/11] net/mlx5: support L3 VXLAN flow Xueming Li
2018-04-18 6:48 ` Nélio Laranjeiro
2018-04-18 14:43 ` Xueming(Steven) Li
2018-04-18 15:08 ` Nélio Laranjeiro
2018-04-19 6:20 ` Xueming(Steven) Li
2018-04-19 6:55 ` Nélio Laranjeiro
2018-04-19 10:21 ` Xueming(Steven) Li
2018-04-19 11:15 ` Nélio Laranjeiro
2018-04-19 11:53 ` Xueming(Steven) Li
2018-04-19 12:18 ` Nélio Laranjeiro
2018-04-19 12:49 ` Xueming(Steven) Li
2018-04-19 13:40 ` Nélio Laranjeiro
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 04/11] net/mlx5: support Rx tunnel type identification Xueming Li
2018-04-18 6:50 ` Nélio Laranjeiro
2018-04-18 14:33 ` Xueming(Steven) Li
2018-04-18 15:06 ` Nélio Laranjeiro
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 05/11] net/mlx5: cleanup tunnel checksum offloads Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 06/11] net/mlx5: split flow RSS handling logic Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 07/11] net/mlx5: support tunnel RSS level Xueming Li
2018-04-18 6:55 ` Nélio Laranjeiro
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 08/11] net/mlx5: add hardware flow debug dump Xueming Li
2018-04-18 6:57 ` Nélio Laranjeiro
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 09/11] net/mlx5: introduce VXLAN-GPE tunnel type Xueming Li
2018-04-18 6:58 ` Nélio Laranjeiro
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 10/11] net/mlx5: allow flow tunnel ID 0 with outer pattern Xueming Li
2018-04-17 15:14 ` [dpdk-dev] [PATCH v4 11/11] doc: update mlx5 guide on tunnel offloading Xueming Li
2018-04-18 7:00 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 01/14] net/mlx5: support 16 hardware priorities Xueming Li
2018-04-13 11:58 ` Nélio Laranjeiro
2018-04-13 13:10 ` Xueming(Steven) Li
2018-04-13 13:46 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 02/14] net/mlx5: support GRE tunnel flow Xueming Li
2018-04-13 12:02 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 03/14] net/mlx5: support L3 VXLAN flow Xueming Li
2018-04-13 12:13 ` Nélio Laranjeiro
2018-04-13 13:51 ` Xueming(Steven) Li
2018-04-13 14:04 ` Xueming(Steven) Li
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 04/14] net/mlx5: support Rx tunnel type identification Xueming Li
2018-04-13 13:02 ` Nélio Laranjeiro
2018-04-14 12:57 ` Xueming(Steven) Li
2018-04-16 7:28 ` Nélio Laranjeiro
2018-04-16 8:05 ` Xueming(Steven) Li
2018-04-16 9:28 ` Adrien Mazarguil
2018-04-16 13:32 ` Xueming(Steven) Li
2018-04-16 13:47 ` Adrien Mazarguil
2018-04-16 15:27 ` Xueming(Steven) Li
2018-04-16 16:02 ` Adrien Mazarguil
2018-04-17 4:53 ` Xueming(Steven) Li
2018-04-17 7:20 ` Nélio Laranjeiro
2018-04-17 11:50 ` Xueming(Steven) Li
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 05/14] net/mlx5: cleanup tunnel checksum offloads Xueming Li
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 06/14] net/mlx5: split flow RSS handling logic Xueming Li
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 07/14] net/mlx5: support tunnel RSS level Xueming Li
2018-04-13 13:27 ` Nélio Laranjeiro
2018-04-14 10:12 ` Xueming(Steven) Li
2018-04-16 12:25 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 08/14] net/mlx5: add hardware flow debug dump Xueming Li
2018-04-13 13:29 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 09/14] net/mlx5: introduce VXLAN-GPE tunnel type Xueming Li
2018-04-13 13:32 ` Nélio Laranjeiro [this message]
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 10/14] net/mlx5: allow flow tunnel ID 0 with outer pattern Xueming Li
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 11/14] net/mlx5: support MPLS-in-GRE and MPLS-in-UDP Xueming Li
2018-04-13 13:37 ` Nélio Laranjeiro
2018-04-13 14:48 ` Xueming(Steven) Li
2018-04-13 14:55 ` Nélio Laranjeiro
2018-04-13 15:22 ` Xueming(Steven) Li
2018-04-16 8:14 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 12/14] doc: update mlx5 guide on tunnel offloading Xueming Li
2018-04-13 13:38 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 13/14] net/mlx5: fix invalid flow item check Xueming Li
2018-04-13 13:40 ` Nélio Laranjeiro
2018-04-13 11:20 ` [dpdk-dev] [PATCH v3 14/14] net/mlx5: support RSS configuration in isolated mode Xueming Li
2018-04-13 13:43 ` Nélio Laranjeiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180413133201.me2murq4kgdcp4xy@laranjeiro-vm.dev.6wind.com \
--to=nelio.laranjeiro@6wind.com \
--cc=dev@dpdk.org \
--cc=shahafs@mellanox.com \
--cc=xuemingl@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).