From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 86E872BE2 for ; Mon, 23 Apr 2018 14:55:08 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id g21-v6so13507220wrb.8 for ; Mon, 23 Apr 2018 05:55:08 -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:content-transfer-encoding:in-reply-to :user-agent; bh=xSEFf2lQntmy0VSYjnbuDKHJ5e7EK356CKqvBg52lyg=; b=dAYCaIcYqaZIIwkN6uYqsGDkX/ATP/JGezhni/SQIKed5Kxke3Asd6MSv3di84Ur5f ljm4r49FvsQttK2EuEPfDQ43D1ZNgXFSoPCMlroFJ9kQFMDjqNbmo13BzkbJ0gJUXaVb /8HMi+NEjR1cvukKjgI/jJ4q+LjksDFP8Gac9JmpP0dJ5I0xhK27L8uv4PiooHn+dIfB 0Awk95LDzd1LB6bO/BLCSTOGiNgY+TFQlE+C3r/59JLRo358SzC/N+Cgj1IVOZgnekDy iwfSTYCa5fKQrc0hIe8eFtFQ+FaLYtnwLVgo3Mmjq1zOaUJakfIle7TwYZ+zB8F/fWT+ Mrng== 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:content-transfer-encoding :in-reply-to:user-agent; bh=xSEFf2lQntmy0VSYjnbuDKHJ5e7EK356CKqvBg52lyg=; b=nddSU+3c5bN8RWTPzN58PW8+/H9PWtAHuXH46Bxkq14CMz1NKgkWOJnmB5zLkSAKxZ iP7mHQVlVv+iaUY2T+91OZAkXxFgocjyPqNOZeqrYPTYApGHJiVx04SlZpLRN0mJmTGH xI5LP3zx016wArdX3M6u9m57PrpWL+cwsmTjnv3TekDCijMY3eyzNqy9TldQYSvPdI6N 12UI83UwXG6lVV4XVQnd9MucZsCxoc0sZlHDSQg9bXWSE23OlVU0ynimslt2UhudcPCj TUHI8Nc0gUo5EDqvC1FDZnhe38YOIM1pQsr2zu+GNlRViyDlLMFB0VcGn06WOS2JkgXB faaQ== X-Gm-Message-State: ALQs6tBp7dfhNuP0qyixs5DqH8WsNIjSbN75+TlhDqeH9TN2LkIygf1d zFo6QR47B61eBXejXZogvlOI X-Google-Smtp-Source: AIpwx487XOx/KYVri6FqvbRijmWS7Nib3KCYIDeWaGV5GEQwUJ0YpdmPV0RgV5n2UTmwgRy+VRweng== X-Received: by 2002:adf:e092:: with SMTP id c18-v6mr15218891wri.70.1524488108284; Mon, 23 Apr 2018 05:55:08 -0700 (PDT) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id j76sm21512202wmf.33.2018.04.23.05.55.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Apr 2018 05:55:07 -0700 (PDT) Date: Mon, 23 Apr 2018 14:55:53 +0200 From: =?iso-8859-1?Q?N=E9lio?= Laranjeiro To: Xueming Li Cc: Shahaf Shuler , dev@dpdk.org Message-ID: <20180423125553.xr2mbqd7pfqvil4j@laranjeiro-vm.dev.6wind.com> References: <20180420122340.113348-1-xuemingl@mellanox.com> <20180423123310.32991-3-xuemingl@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180423123310.32991-3-xuemingl@mellanox.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [dpdk-dev] [PATCH v6 02/11] net/mlx5: support GRE tunnel flow 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: Mon, 23 Apr 2018 12:55:08 -0000 On Mon, Apr 23, 2018 at 08:33:01PM +0800, Xueming Li wrote: > Signed-off-by: Xueming Li > --- > drivers/net/mlx5/mlx5_flow.c | 101 ++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 94 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 5402cb148..b365f9868 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -37,6 +37,7 @@ > /* Internet Protocol versions. */ > #define MLX5_IPV4 4 > #define MLX5_IPV6 6 > +#define MLX5_GRE 47 > > #ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT > struct ibv_flow_spec_counter_action { > @@ -89,6 +90,11 @@ mlx5_flow_create_vxlan(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); > + > struct mlx5_flow_parse; > > static void > @@ -231,6 +237,10 @@ struct rte_flow { > __VA_ARGS__, RTE_FLOW_ITEM_TYPE_END, \ > } > > +#define IS_TUNNEL(type) ( \ > + (type) == RTE_FLOW_ITEM_TYPE_VXLAN || \ > + (type) == RTE_FLOW_ITEM_TYPE_GRE) > + > /** Structure to generate a simple graph of layers supported by the NIC. */ > struct mlx5_flow_items { > /** List of possible actions for these items. */ > @@ -284,7 +294,8 @@ static const enum rte_flow_action_type valid_actions[] = { > 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, > + RTE_FLOW_ITEM_TYPE_GRE), > }, > [RTE_FLOW_ITEM_TYPE_ETH] = { > .items = ITEMS(RTE_FLOW_ITEM_TYPE_VLAN, > @@ -316,7 +327,8 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { > }, > [RTE_FLOW_ITEM_TYPE_IPV4] = { > .items = ITEMS(RTE_FLOW_ITEM_TYPE_UDP, > - RTE_FLOW_ITEM_TYPE_TCP), > + RTE_FLOW_ITEM_TYPE_TCP, > + RTE_FLOW_ITEM_TYPE_GRE), > .actions = valid_actions, > .mask = &(const struct rte_flow_item_ipv4){ > .hdr = { > @@ -333,7 +345,8 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { > }, > [RTE_FLOW_ITEM_TYPE_IPV6] = { > .items = ITEMS(RTE_FLOW_ITEM_TYPE_UDP, > - RTE_FLOW_ITEM_TYPE_TCP), > + RTE_FLOW_ITEM_TYPE_TCP, > + RTE_FLOW_ITEM_TYPE_GRE), > .actions = valid_actions, > .mask = &(const struct rte_flow_item_ipv6){ > .hdr = { > @@ -386,6 +399,19 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { > .convert = mlx5_flow_create_tcp, > .dst_sz = sizeof(struct ibv_flow_spec_tcp_udp), > }, > + [RTE_FLOW_ITEM_TYPE_GRE] = { > + .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_gre){ > + .protocol = -1, > + }, > + .default_mask = &rte_flow_item_gre_mask, > + .mask_sz = sizeof(struct rte_flow_item_gre), > + .convert = mlx5_flow_create_gre, > + .dst_sz = sizeof(struct ibv_flow_spec_tunnel), > + }, > [RTE_FLOW_ITEM_TYPE_VXLAN] = { > .items = ITEMS(RTE_FLOW_ITEM_TYPE_ETH), > .actions = valid_actions, > @@ -401,7 +427,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { > > /** Structure to pass to the conversion function. */ > struct mlx5_flow_parse { > - uint32_t inner; /**< Set once VXLAN is encountered. */ > + uint32_t inner; /**< Verbs value, set once tunnel is encountered. */ > uint32_t create:1; > /**< Whether resources should remain after a validate. */ > uint32_t drop:1; /**< Target is a drop queue. */ > @@ -829,13 +855,13 @@ mlx5_flow_convert_items_validate(const struct rte_flow_item items[], > cur_item->mask_sz); > if (ret) > goto exit_item_not_supported; > - if (items->type == RTE_FLOW_ITEM_TYPE_VXLAN) { > + if (IS_TUNNEL(items->type)) { > if (parser->inner) { > rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ITEM, > items, > - "cannot recognize multiple" > - " VXLAN encapsulations"); > + "Cannot recognize multiple" > + " tunnel encapsulations."); > return -rte_errno; > } > parser->inner = IBV_FLOW_SPEC_INNER; > @@ -1641,6 +1667,67 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item, > } > > /** > + * Convert GRE 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_gre(const struct rte_flow_item *item __rte_unused, > + const void *default_mask __rte_unused, > + struct mlx5_flow_data *data) > +{ > + struct mlx5_flow_parse *parser = data->parser; > + unsigned int size = sizeof(struct ibv_flow_spec_tunnel); > + struct ibv_flow_spec_tunnel tunnel = { > + .type = parser->inner | IBV_FLOW_SPEC_VXLAN_TUNNEL, > + .size = size, > + }; > + struct ibv_flow_spec_ipv4_ext *ipv4; > + struct ibv_flow_spec_ipv6 *ipv6; > + unsigned int i; > + > + parser->inner = IBV_FLOW_SPEC_INNER; > + /* Update encapsulation IP layer protocol. */ > + for (i = 0; i != hash_rxq_init_n; ++i) { > + if (!parser->queue[i].ibv_attr) > + continue; > + if (parser->out_layer == HASH_RXQ_IPV4) { > + ipv4 = (void *)((uintptr_t)parser->queue[i].ibv_attr + > + parser->queue[i].offset - > + sizeof(struct ibv_flow_spec_ipv4_ext)); > + if (ipv4->mask.proto && ipv4->val.proto != MLX5_GRE) > + break; > + ipv4->val.proto = MLX5_GRE; > + ipv4->mask.proto = 0xff; > + } else if (parser->out_layer == HASH_RXQ_IPV6) { > + ipv6 = (void *)((uintptr_t)parser->queue[i].ibv_attr + > + parser->queue[i].offset - > + sizeof(struct ibv_flow_spec_ipv6)); > + if (ipv6->mask.next_hdr && > + ipv6->val.next_hdr != MLX5_GRE) > + break; > + ipv6->val.next_hdr = MLX5_GRE; > + ipv6->mask.next_hdr = 0xff; > + } > + } > + if (i != hash_rxq_init_n) > + return rte_flow_error_set(data->error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + item, > + "IP protocol of GRE must be 47"); > + mlx5_flow_create_copy(parser, &tunnel, size); > + return 0; > +} There is something strange, item is not unused as it is at least used in the rte_flow_error_set(). In the other series you are pushing, there is no new RTE_FLOW_ITEM_GRE and in the current code there is also no RTE_FLOW_ITEM_GRE. I don't see how this code can match the missing item, what am I missing? > +/** > * Convert mark/flag action to Verbs specification. > * > * @param parser > -- > 2.13.3 Thanks, -- Nélio Laranjeiro 6WIND