diff mbox

[dpdk-dev,v1] net/mlx5: fix flow director rule deletion crash

Message ID 20180426161641.5788-1-adrien.mazarguil@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Adrien Mazarguil April 26, 2018, 4:17 p.m. UTC 
  Flow director rules matching traffic properties above layer 2 do not
target a fixed hash Rx queue (HASH_RXQ_ETH), it actually depends on the
highest protocol layer specified by each flow rule.

mlx5_fdir_filter_delete() makes this wrong assumption and causes a crash
when attempting to destroy flow rules with L3/L4 specifications.

Fixes: 4c3e9bcdd52e ("net/mlx5: support flow director")
Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Cc: stable@dpdk.org

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
 drivers/net/mlx5/mlx5_flow.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Nélio Laranjeiro April 27, 2018, 6:55 a.m. UTC | #1 
On Thu, Apr 26, 2018 at 06:17:46PM +0200, Adrien Mazarguil wrote:
> Flow director rules matching traffic properties above layer 2 do not
> target a fixed hash Rx queue (HASH_RXQ_ETH), it actually depends on the
> highest protocol layer specified by each flow rule.
> 
> mlx5_fdir_filter_delete() makes this wrong assumption and causes a crash
> when attempting to destroy flow rules with L3/L4 specifications.
> 
> Fixes: 4c3e9bcdd52e ("net/mlx5: support flow director")
> Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> Cc: stable@dpdk.org
> 
> Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

> ---
>  drivers/net/mlx5/mlx5_flow.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 8f5fcf4d6..05def2b14 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -3409,13 +3409,13 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
>  	if (parser.drop) {
>  		struct ibv_flow_spec_action_drop *drop;
>  
> -		drop = (void *)((uintptr_t)parser.queue[HASH_RXQ_ETH].ibv_attr +
> -				parser.queue[HASH_RXQ_ETH].offset);
> +		drop = (void *)((uintptr_t)parser.queue[parser.layer].ibv_attr +
> +				parser.queue[parser.layer].offset);
>  		*drop = (struct ibv_flow_spec_action_drop){
>  			.type = IBV_FLOW_SPEC_ACTION_DROP,
>  			.size = sizeof(struct ibv_flow_spec_action_drop),
>  		};
> -		parser.queue[HASH_RXQ_ETH].ibv_attr->num_of_specs++;
> +		parser.queue[parser.layer].ibv_attr->num_of_specs++;
>  	}
>  	TAILQ_FOREACH(flow, &priv->flows, next) {
>  		struct ibv_flow_attr *attr;
> @@ -3426,8 +3426,8 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
>  		void *flow_spec;
>  		unsigned int specs_n;
>  
> -		attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
> -		flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
> +		attr = parser.queue[parser.layer].ibv_attr;
> +		flow_attr = flow->frxq[parser.layer].ibv_attr;
>  		/* Compare first the attributes. */
>  		if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr)))
>  			continue;
> -- 
> 2.11.0
Shahaf Shuler April 29, 2018, 5:51 a.m. UTC | #2 
Friday, April 27, 2018 9:55 AM, Nélio Laranjeiro:
> Subject: Re: [PATCH v1] net/mlx5: fix flow director rule deletion crash
> 
> On Thu, Apr 26, 2018 at 06:17:46PM +0200, Adrien Mazarguil wrote:
> > Flow director rules matching traffic properties above layer 2 do not
> > target a fixed hash Rx queue (HASH_RXQ_ETH), it actually depends on
> > the highest protocol layer specified by each flow rule.
> >
> > mlx5_fdir_filter_delete() makes this wrong assumption and causes a
> > crash when attempting to destroy flow rules with L3/L4 specifications.
> >
> > Fixes: 4c3e9bcdd52e ("net/mlx5: support flow director")
> > Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
> 
> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> 
> > ---
> >  drivers/net/mlx5/mlx5_flow.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow.c
> > b/drivers/net/mlx5/mlx5_flow.c index 8f5fcf4d6..05def2b14 100644
> > --- a/drivers/net/mlx5/mlx5_flow.c
> > +++ b/drivers/net/mlx5/mlx5_flow.c
> > @@ -3409,13 +3409,13 @@ mlx5_fdir_filter_delete(struct rte_eth_dev
> *dev,
> >  	if (parser.drop) {
> >  		struct ibv_flow_spec_action_drop *drop;
> >
> > -		drop = (void
> *)((uintptr_t)parser.queue[HASH_RXQ_ETH].ibv_attr +
> > -				parser.queue[HASH_RXQ_ETH].offset);
> > +		drop = (void
> *)((uintptr_t)parser.queue[parser.layer].ibv_attr +
> > +				parser.queue[parser.layer].offset);
> >  		*drop = (struct ibv_flow_spec_action_drop){
> >  			.type = IBV_FLOW_SPEC_ACTION_DROP,
> >  			.size = sizeof(struct ibv_flow_spec_action_drop),
> >  		};
> > -		parser.queue[HASH_RXQ_ETH].ibv_attr->num_of_specs++;
> > +		parser.queue[parser.layer].ibv_attr->num_of_specs++;
> >  	}
> >  	TAILQ_FOREACH(flow, &priv->flows, next) {
> >  		struct ibv_flow_attr *attr;
> > @@ -3426,8 +3426,8 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
> >  		void *flow_spec;
> >  		unsigned int specs_n;
> >
> > -		attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
> > -		flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
> > +		attr = parser.queue[parser.layer].ibv_attr;
> > +		flow_attr = flow->frxq[parser.layer].ibv_attr;
> >  		/* Compare first the attributes. */
> >  		if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr)))
> >  			continue;
> > --
> > 2.11.0

Applied to next-net-mlx, thanks. 

> 
> --
> Nélio Laranjeiro
> 6WIND
diff mbox

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 8f5fcf4d6..05def2b14 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3409,13 +3409,13 @@  mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
 	if (parser.drop) {
 		struct ibv_flow_spec_action_drop *drop;
 
-		drop = (void *)((uintptr_t)parser.queue[HASH_RXQ_ETH].ibv_attr +
-				parser.queue[HASH_RXQ_ETH].offset);
+		drop = (void *)((uintptr_t)parser.queue[parser.layer].ibv_attr +
+				parser.queue[parser.layer].offset);
 		*drop = (struct ibv_flow_spec_action_drop){
 			.type = IBV_FLOW_SPEC_ACTION_DROP,
 			.size = sizeof(struct ibv_flow_spec_action_drop),
 		};
-		parser.queue[HASH_RXQ_ETH].ibv_attr->num_of_specs++;
+		parser.queue[parser.layer].ibv_attr->num_of_specs++;
 	}
 	TAILQ_FOREACH(flow, &priv->flows, next) {
 		struct ibv_flow_attr *attr;
@@ -3426,8 +3426,8 @@  mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
 		void *flow_spec;
 		unsigned int specs_n;
 
-		attr = parser.queue[HASH_RXQ_ETH].ibv_attr;
-		flow_attr = flow->frxq[HASH_RXQ_ETH].ibv_attr;
+		attr = parser.queue[parser.layer].ibv_attr;
+		flow_attr = flow->frxq[parser.layer].ibv_attr;
 		/* Compare first the attributes. */
 		if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr)))
 			continue;