From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Gunthorpe Subject: Re: [PATCH mlx5-next v1 05/15] net/mlx5: Break encap/decap into two separated flow table creation flags Date: Tue, 4 Sep 2018 16:02:42 -0600 Message-ID: <20180904220242.GA3895@ziepe.ca> References: <20180828111854.14367-1-leon@kernel.org> <20180828111854.14367-6-leon@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Doug Ledford , Leon Romanovsky , RDMA mailing list , Ariel Levkovich , Mark Bloch , Or Gerlitz , Saeed Mahameed , linux-netdev To: Leon Romanovsky Return-path: Received: from mail-pl1-f194.google.com ([209.85.214.194]:44900 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726944AbeIEC3s (ORCPT ); Tue, 4 Sep 2018 22:29:48 -0400 Received: by mail-pl1-f194.google.com with SMTP id ba4-v6so2249144plb.11 for ; Tue, 04 Sep 2018 15:02:44 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20180828111854.14367-6-leon@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Aug 28, 2018 at 02:18:44PM +0300, Leon Romanovsky wrote: > From: Mark Bloch > > Today we are able to attach encap and decap actions only to the FDB. In > preparation to enable those actions on the NIC flow tables, break the > single flag into two. Those flags control whatever a decap or encap > operations can be attached to the flow table created. For FDB, if > encapsulation is required, we set both of them. > > Signed-off-by: Mark Bloch > Reviewed-by: Saeed Mahameed > Reviewed-by: Or Gerlitz > Signed-off-by: Leon Romanovsky > drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 ++- > drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 7 ++++--- > include/linux/mlx5/fs.h | 3 ++- > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c > index f72b5c9dcfe9..ff21807a0c4b 100644 > +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c > @@ -529,7 +529,8 @@ static int esw_create_offloads_fast_fdb_table(struct mlx5_eswitch *esw) > esw_size >>= 1; > > if (esw->offloads.encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE) > - flags |= MLX5_FLOW_TABLE_TUNNEL_EN; > + flags |= (MLX5_FLOW_TABLE_TUNNEL_EN_ENCAP | > + MLX5_FLOW_TABLE_TUNNEL_EN_DECAP); > > fdb = mlx5_create_auto_grouped_flow_table(root_ns, FDB_FAST_PATH, > esw_size, > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c > index 9ae777e56529..1698f325a21e 100644 > +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c > @@ -152,7 +152,8 @@ static int mlx5_cmd_create_flow_table(struct mlx5_core_dev *dev, > struct mlx5_flow_table *next_ft, > unsigned int *table_id, u32 flags) > { > - int en_encap_decap = !!(flags & MLX5_FLOW_TABLE_TUNNEL_EN); > + int en_encap = !!(flags & MLX5_FLOW_TABLE_TUNNEL_EN_ENCAP); > + int en_decap = !!(flags & MLX5_FLOW_TABLE_TUNNEL_EN_DECAP); Yuk, please don't use !!. bool en_decap = flags & MLX5_FLOW_TABLE_TUNNEL_EN_DECAP; Jason