From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 57F825F4D for ; Thu, 17 May 2018 15:32:16 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id i14-v6so5717041wre.2 for ; Thu, 17 May 2018 06:32:16 -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=fYLudZw3XXgORyDxYKH4qkR7siLkT9e+eVwruK/0HL8=; b=tBjh564Bx7l1XgcrudM1NDwgyfwgz7hKgOGV3NUDQkOa+B88kQUA5h1xy1QFmGPzJo 7uXwD8I04VdcprNaAQXOHUr6pa017Xo3xALMc0suLnowNug76GLgU/BEoY6X2mNJhdwA vH4qrgdA1AzEPO8bk0Vfmsl31+7svttf9SIfFKQogD/WTWlpz9to0EMi5yBOiP8jVMz+ FsEWQz+pQP6pKbxRAfPh/lghgASqkN/X7PP55uAA2firIlNJRfvKUO+fSx2kI+mxWFZQ w1wxxELKASoMnwJ0r8EO570eyWCqcZLfoHg0HRrgDPRrxRDRcIF0PRbUdBH9riEScMYy 8B7g== 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=fYLudZw3XXgORyDxYKH4qkR7siLkT9e+eVwruK/0HL8=; b=cm9tJgZO36u2MobPGL7ga8Kw9cu+YsJjUVXlo9Cobp+G4jdSRtQvn66Ou5h2/I/eqA mWbBgMHHFk9wv/3iGaTYUYJvaQNCXgQH+j5j9LvulhrOfBMgafsUITMeki1p0wwE2uaU ZswPyii+7cfHSjDlKK4HN6TYNhDksezi83qP1RivAeWLaHCqMdeKwdclxx6cdmxlYr5i F7AD4CvO04SXtRHr8U3rGiDckx7PI5NMKeBcsGRaAaC7+XBv4DSJItNCmVuTLrN5OeZu tQFmbSUVx2rGdhUwQLCAW/epW5KWwxasejoAiwE8f14jesoXhXnO9uC23ol9sB2TwFlZ OxWQ== X-Gm-Message-State: ALKqPwfSM1OSSR7xnkTNrRgHeUUXcoOEB+Yu6N0nBs8zlFy6iT2+TEQZ 46Gb7krEpmccpg+YDg7m5KcN X-Google-Smtp-Source: AB8JxZp8W4WeW68nI89XjUWitxhjdrNyNQmEwD5npSmUdsaFm5J8v/VblHgex4c5j5OJTkV0EwKoZg== X-Received: by 2002:adf:e802:: with SMTP id o2-v6mr4729975wrm.123.1526563936143; Thu, 17 May 2018 06:32:16 -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 4-v6sm6577329wmg.40.2018.05.17.06.32.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 06:32:15 -0700 (PDT) Date: Thu, 17 May 2018 15:32:01 +0200 From: =?iso-8859-1?Q?N=E9lio?= Laranjeiro To: Shahaf Shuler Cc: adrien.mazarguil@6wind.com, yskoh@mellanox.com, dev@dpdk.org, xuemingl@mellanox.com, matan@mellanox.com Message-ID: <20180517133201.vf32khpzv44ds2xb@laranjeiro-vm.dev.6wind.com> References: <20180515132324.192750-1-shahafs@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180515132324.192750-1-shahafs@mellanox.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [dpdk-dev] [PATCH] net/mlx5: fix default RSS level 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, 17 May 2018 13:32:16 -0000 On Tue, May 15, 2018 at 04:23:24PM +0300, Shahaf Shuler wrote: > Using inner RSS by default for GRE leads to memory corruption as the > extra flow items added for the inner RSS are not counted in the flow > attributes buffer size. > > Fixing by enforcing the default RSS level to be outer. This much > simplify the flow engine and more robust. > Future optimization for out of the box RSS can be done on subsequent > commits. > > Fixes: d4a405186b73 ("net/mlx5: support tunnel RSS level") > Cc: xuemingl@mellanox.com > Cc: matan@mellanox.com > > Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro > --- > drivers/net/mlx5/mlx5_flow.c | 22 ++-------------------- > 1 file changed, 2 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index 0c0d6f99ad..994be05be6 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -805,7 +805,7 @@ mlx5_flow_convert_actions(struct rte_eth_dev *dev, > } > parser->rss_conf = (struct rte_flow_action_rss){ > .func = RTE_ETH_HASH_FUNCTION_DEFAULT, > - .level = rss->level, > + .level = rss->level ? rss->level : 1, > .types = rss->types, > .key_len = rss_key_len, > .queue_num = rss->queue_num, > @@ -1166,9 +1166,6 @@ mlx5_flow_convert_rss(struct mlx5_flow_parse *parser) > int outer = parser->tunnel && parser->rss_conf.level < 2; > uint64_t rss = parser->rss_conf.types; > > - /* Default to outer RSS. */ > - if (!parser->rss_conf.level) > - parser->rss_conf.level = 1; > layer = outer ? parser->out_layer : parser->layer; > if (layer == HASH_RXQ_TUNNEL) > layer = HASH_RXQ_ETH; > @@ -1801,9 +1798,6 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item, > parser->tunnel = ptype_ext[PTYPE_IDX(RTE_PTYPE_TUNNEL_VXLAN)]; > parser->out_layer = parser->layer; > parser->layer = HASH_RXQ_TUNNEL; > - /* Default VXLAN to outer RSS. */ > - if (!parser->rss_conf.level) > - parser->rss_conf.level = 1; > if (spec) { > if (!mask) > mask = default_mask; > @@ -1876,9 +1870,6 @@ mlx5_flow_create_vxlan_gpe(const struct rte_flow_item *item, > parser->tunnel = ptype_ext[PTYPE_IDX(RTE_PTYPE_TUNNEL_VXLAN_GPE)]; > parser->out_layer = parser->layer; > parser->layer = HASH_RXQ_TUNNEL; > - /* Default VXLAN-GPE to outer RSS. */ > - if (!parser->rss_conf.level) > - parser->rss_conf.level = 1; > if (spec) { > if (!mask) > mask = default_mask; > @@ -1956,9 +1947,6 @@ mlx5_flow_create_gre(const struct rte_flow_item *item, > parser->tunnel = ptype_ext[PTYPE_IDX(RTE_PTYPE_TUNNEL_GRE)]; > parser->out_layer = parser->layer; > parser->layer = HASH_RXQ_TUNNEL; > - /* Default GRE to inner RSS. */ > - if (!parser->rss_conf.level) > - parser->rss_conf.level = 2; > #ifdef HAVE_IBV_DEVICE_MPLS_SUPPORT > if (spec) { > if (!mask) > @@ -2052,12 +2040,6 @@ mlx5_flow_create_mpls(const struct rte_flow_item *item, > /* parser->out_layer stays as in GRE out_layer. */ > } > parser->layer = HASH_RXQ_TUNNEL; > - /* > - * For MPLS-in-GRE, RSS level should have been set. > - * For MPLS-in-UDP, use outer RSS. > - */ > - if (!parser->rss_conf.level) > - parser->rss_conf.level = 1; > if (spec) { > if (!mask) > mask = default_mask; > @@ -2501,7 +2483,7 @@ mlx5_flow_list_create(struct rte_eth_dev *dev, > flow->tunnel = parser.tunnel; > flow->rss_conf = (struct rte_flow_action_rss){ > .func = RTE_ETH_HASH_FUNCTION_DEFAULT, > - .level = 0, > + .level = parser.rss_conf.level, > .types = parser.rss_conf.types, > .key_len = parser.rss_conf.key_len, > .queue_num = parser.rss_conf.queue_num, > -- > 2.12.0 > -- Nélio Laranjeiro 6WIND