On Thu, Dec 14, 2017 at 03:49:32PM +0100, Maxime Coquelin wrote: > > > On 12/14/2017 03:33 PM, Olivier Matz wrote: > >From: Didier Pallard <didier.pall...@6wind.com> > > > >The rx_queues and tx_queues fields of the data structure points to a struct > >virtnet_rx or virtnet_tx. Casting it to a virtqueue is an error. > > > >It does not trigger any bug because pointer is not dereferenced inside the > >function, but it can become a bug if this code is copy/pasted and vq is > >dereferenced. > > > >Fixes: 01ad44fd374f ("net/virtio: split Rx/Tx queue") > >Cc: sta...@dpdk.org > > > >Signed-off-by: Didier Pallard <didier.pall...@6wind.com> > >Signed-off-by: Olivier Matz <olivier.m...@6wind.com> > >--- > > drivers/net/virtio/virtio_ethdev.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > >diff --git a/drivers/net/virtio/virtio_ethdev.c > >b/drivers/net/virtio/virtio_ethdev.c > >index c0ba83b06..b398f9960 100644 > >--- a/drivers/net/virtio/virtio_ethdev.c > >+++ b/drivers/net/virtio/virtio_ethdev.c > >@@ -893,7 +893,7 @@ static int virtio_dev_xstats_get_names(struct > >rte_eth_dev *dev, > > /* Note: limit checked in rte_eth_xstats_names() */ > > for (i = 0; i < dev->data->nb_rx_queues; i++) { > >- struct virtqueue *rxvq = dev->data->rx_queues[i]; > >+ struct virtnet_rx *rxvq = dev->data->rx_queues[i]; > > if (rxvq == NULL) > > continue; > > for (t = 0; t < VIRTIO_NB_RXQ_XSTATS; t++) { > >@@ -906,7 +906,7 @@ static int virtio_dev_xstats_get_names(struct > >rte_eth_dev *dev, > > } > > for (i = 0; i < dev->data->nb_tx_queues; i++) { > >- struct virtqueue *txvq = dev->data->tx_queues[i]; > >+ struct virtnet_tx *txvq = dev->data->tx_queues[i]; > > if (txvq == NULL) > > continue; > > for (t = 0; t < VIRTIO_NB_TXQ_XSTATS; t++) { > > > > Reviewed-by: Maxime Coquelin <maxime.coque...@redhat.com>
Applied to dpdk-next-virtio. Thanks. --yliu