[dpdk-dev] net/virtio-user: fix add pointer checking for rxvq

Message ID 20180524130423.15554-1-zhiyong.yang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers

Checks

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

Commit Message

Yang, Zhiyong May 24, 2018, 1:04 p.m. UTC
  For virtio-user server mode, One use case comes across segmentation fault.
step 1: Launch vhost side as client firstly.
step 2: launch virtio-user side as server.

The cause is: after registering virtio_interrupt_handler into
eal-intr-thread, two threads (main thread and eal-intr-thread) have
sync issues, so add rxvq pointer checking in function virtio_notify_peers
to decide if the code can continue.

Fixes: bd8f50a45d0f ("net/virtio-user: support server mode")
Cc: stable@dpdk.org
Cc: maxime.coquelin@redhat.com
Cc: tiwei.bie@intel.com
Cc: lei.a.yao@intel.com
Cc: ferruh.yigit@intel.com

Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
---
 drivers/net/virtio/virtio_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)
  

Comments

Maxime Coquelin May 24, 2018, 7:39 a.m. UTC | #1
Hi,

I would use net/virtio prefix instead, as IIUC, the impacted code can
also be called by Virtio PMD.

On 05/24/2018 03:04 PM, zhiyong.yang@intel.com wrote:
> For virtio-user server mode, One use case comes across segmentation fault.
> step 1: Launch vhost side as client firstly.
> step 2: launch virtio-user side as server.
> 
> The cause is: after registering virtio_interrupt_handler into
> eal-intr-thread, two threads (main thread and eal-intr-thread) have
> sync issues, so add rxvq pointer checking in function virtio_notify_peers
> to decide if the code can continue.
> 
> Fixes: bd8f50a45d0f ("net/virtio-user: support server mode")
> Cc: stable@dpdk.org
> Cc: maxime.coquelin@redhat.com
> Cc: tiwei.bie@intel.com
> Cc: lei.a.yao@intel.com
> Cc: ferruh.yigit@intel.com
> 
> Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
> ---
>   drivers/net/virtio/virtio_ethdev.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
> index 5833dad73..df50a571a 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -1245,6 +1245,9 @@ virtio_notify_peers(struct rte_eth_dev *dev)
>   		return;
>   
>   	rxvq = dev->data->rx_queues[0];
> +	if (!rxvq)
> +		return;
> +

Other than that, it looks good to me:
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

>   	rarp_mbuf = rte_net_make_rarp_packet(rxvq->mpool,
>   			(struct ether_addr *)hw->mac_addr);
>   	if (rarp_mbuf == NULL) {
>
  

Patch

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 5833dad73..df50a571a 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1245,6 +1245,9 @@  virtio_notify_peers(struct rte_eth_dev *dev)
 		return;
 
 	rxvq = dev->data->rx_queues[0];
+	if (!rxvq)
+		return;
+
 	rarp_mbuf = rte_net_make_rarp_packet(rxvq->mpool,
 			(struct ether_addr *)hw->mac_addr);
 	if (rarp_mbuf == NULL) {