[dpdk-stable] [PATCH v2] net/virtio: fix check scatter on all Rx queues

[Maxime Coquelin]

On 10/8/21 07:49, zhihongx.peng at intel.com wrote:
> From: Zhihong Peng <zhihongx.peng at intel.com>
> 
> This patch fixes the wrong way to obtain virtqueue.
> The end of virtqueue cannot be judged based on whether
> the array is NULL.
> 
> Fixes: 4e8169eb0d2d (net/virtio: fix Rx scatter offload)
> Cc: stable at dpdk.org
> 
> Signed-off-by: Zhihong Peng <zhihongx.peng at intel.com>
> ---
>   drivers/net/virtio/virtio_ethdev.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
> index b60eeb24ab..213110cff4 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -888,8 +888,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev,
>   	if (hw->vqs == NULL)
>   		return true;
>   
> -	for (qidx = 0; (vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX]) != NULL;
> -	     qidx++) {
> +	for (qidx = 0; qidx < hw->max_queue_pairs; qidx++) {
> +		vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX];
> +		if (vq == NULL)
> +			continue;
> +
>   		rxvq = &vq->rxq;
>   		if (rxvq->mpool == NULL)
>   			continue;
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>

Thanks,
Maxime