[dpdk-dev] [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when setting hairpin queues

[Ori Kam]

> -----Original Message-----
> From: xiangxia.m.yue at gmail.com <xiangxia.m.yue at gmail.com>
> Sent: Wednesday, November 27, 2019 4:19 PM
> To: dev at dpdk.org
> Cc: Tonghao Zhang <xiangxia.m.yue at gmail.com>; Ori Kam
> <orika at mellanox.com>
> Subject: [PATCH dpdk-dev 1/3] net/mlx5: avoid crash when setting hairpin
> queues
> 
> From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
> 
> If configuring the number of tx/rx queue with rte_eth_dev_configure
> to nr_queues + hairpin_nr_queues, and setting tx/rx queues to
> nr_queues with rte_eth_tx/rx_queue_setup. But not configuring the
> hairpin queues via rte_eth_tx/rx_hairpin_queue_setup.
> 
> When starting the netdev, there is a crash because of NULL accessing.
> 
> Fixes: cf5516696d77 ("ethdev: add hairpin queue")
> Cc: Ori Kam <orika at mellanox.com>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
> ---
>  drivers/net/mlx5/mlx5_ethdev.c  | 2 +-
>  drivers/net/mlx5/mlx5_trigger.c | 5 ++++-
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> b/drivers/net/mlx5/mlx5_ethdev.c
> index 1d6c084119ec..0076d05b00cc 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -476,7 +476,7 @@ mlx5_dev_configure_rss_reta(struct rte_eth_dev
> *dev)
> 
>  		rxq_data = (*priv->rxqs)[i];
>  		rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
> -		if (rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD)
> +		if (rxq_ctrl && rxq_ctrl->type ==
> MLX5_RXQ_TYPE_STANDARD)
>  			rss_queue_arr[j++] = i;
>  	}
>  	rss_queue_n = j;
> diff --git a/drivers/net/mlx5/mlx5_trigger.c
> b/drivers/net/mlx5/mlx5_trigger.c
> index cafab25c67e7..ab6937ab10d1 100644
> --- a/drivers/net/mlx5/mlx5_trigger.c
> +++ b/drivers/net/mlx5/mlx5_trigger.c
> @@ -106,9 +106,12 @@ mlx5_rxq_start(struct rte_eth_dev *dev)
>  	unsigned int i;
>  	int ret = 0;
>  	enum mlx5_rxq_obj_type obj_type = MLX5_RXQ_OBJ_TYPE_IBV;
> +	struct mlx5_rxq_data *rxq = NULL;
> 
>  	for (i = 0; i < priv->rxqs_n; ++i) {
> -		if ((*priv->rxqs)[i]->lro) {
> +		rxq = (*priv->rxqs)[i];
> +
> +		if (rxq && rxq->lro) {
>  			obj_type =  MLX5_RXQ_OBJ_TYPE_DEVX_RQ;
>  			break;
>  		}
> --
> 2.23.0


Nice catch, 

Acked-by: Ori Kam <orika at mellanox.com>
Thanks,
Ori