From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 7DE4E2B9D for ; Sun, 22 Apr 2018 17:11:43 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2C787212DE; Sun, 22 Apr 2018 11:11:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:11:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=q7gevo+ZNd+bQHqrV nVin2qaQdNrmUsIpBKiF7LUZDY=; b=UM+G77aTcAKvmdl1p6XGrX0cDoLLwimm/ XH41Cdsrfof8ykYc+LeI44zKq0JzcFBZD/1Oc/BDJiE6TFMf9OVzmd2SfCzk+smT nk04yLz5cCMNOiY1WY46CT/ICWVZllwLsof6IOFgp+jzoD5BDLENDOZ7yW8zXqFG 3i4XhvwO05N6iady/WsGooB+MbmMH//ILZff6pwlC6fuW2bfzwUluNoIFvkopE6J tdN+rlfyLv83JLuIP6mKat/zeK7TWReOy9kWJc9JsD1sWioIqQ2nf7NryN1Cj0zP WICzHUCLdj4tiF3D9TirxPQM0T5hhme8K7q3NwJRJ/uFfcZhKJSnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=q7gevo+ZNd+bQHqrVnVin2qaQdNrmUsIpBKiF7LUZDY=; b=nAgKCJQR vzt7YKC8JSwEjC7W4YWuSjPwGojmKT+kwML5c1boK97HFi4xJcwD+2LsaRUcs2ml 9LeXDNfWt8EmMbixadzqUxG/GkvBxW9NOgQh8rdZ0PuxRCEwZlAlCgUqsPwHBjHQ Ow0lW3kxAN5j1nwzlQSOKv/OLq6+tfduw7Iog1WQhBnx7f7nxTH0pbJo5zHODesF xxQIRXBNr4Qk8I3KqNbyu0pTalwUQdZJV0se7SY9bNk/lybBbFDbWE5kBopdb75s O9QQloBqDXJsnAr+ApqjajxriA2rnvg99lcNuxbwpkR4RsKdOp8Kei8yJO+M+SBd y9syyWwYYr6oVg== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id C45F110261; Sun, 22 Apr 2018 11:11:40 -0400 (EDT) From: Yuanhan Liu To: Junjie Chen Cc: Zhiyong Yang , Maxime Coquelin , dpdk stable Date: Sun, 22 Apr 2018 23:09:27 +0800 Message-Id: <20180422150949.17523-37-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/vhost: fix crash when creating vdev dynamically' has been queued to LTS release 17.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Apr 2018 15:11:43 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From f225e0f0b08de54ed5dd1fab6e4e410dd72a771f Mon Sep 17 00:00:00 2001 From: Junjie Chen Date: Fri, 30 Mar 2018 14:58:31 +0800 Subject: [PATCH] net/vhost: fix crash when creating vdev dynamically [ upstream commit 30a701a53737a0b6f7953412cc3b3d36c1d49122 ] When creating vdev dynamically, vhost pmd driver starts directly without checking TX/RX queues are ready or not, and thus causes segmentation fault when vhost library accesses queues. This patch adds a flag to check whether queues are setup or not, and adds queues setup into dev_start function to allow user to start them after setting up. Fixes: aed0b12930b3 ("net/vhost: fix socket file deleted on stop") Signed-off-by: Junjie Chen Tested-by: Zhiyong Yang Reviewed-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 69 ++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 2536ee4a2..2299ce877 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -117,6 +117,7 @@ struct pmd_internal { char *dev_name; char *iface_name; uint16_t max_queues; + uint16_t vid; rte_atomic32_t started; }; @@ -527,8 +528,10 @@ update_queuing_status(struct rte_eth_dev *dev) unsigned int i; int allow_queuing = 1; - if (rte_atomic32_read(&internal->started) == 0 || - rte_atomic32_read(&internal->dev_attached) == 0) + if (rte_atomic32_read(&internal->dev_attached) == 0) + return; + + if (rte_atomic32_read(&internal->started) == 0) allow_queuing = 0; /* Wait until rx/tx_pkt_burst stops accessing vhost device */ @@ -551,13 +554,36 @@ update_queuing_status(struct rte_eth_dev *dev) } } +static void +queue_setup(struct rte_eth_dev *eth_dev, struct pmd_internal *internal) +{ + struct vhost_queue *vq; + int i; + + for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { + vq = eth_dev->data->rx_queues[i]; + if (!vq) + continue; + vq->vid = internal->vid; + vq->internal = internal; + vq->port = eth_dev->data->port_id; + } + for (i = 0; i < eth_dev->data->nb_tx_queues; i++) { + vq = eth_dev->data->tx_queues[i]; + if (!vq) + continue; + vq->vid = internal->vid; + vq->internal = internal; + vq->port = eth_dev->data->port_id; + } +} + static int new_device(int vid) { struct rte_eth_dev *eth_dev; struct internal_list *list; struct pmd_internal *internal; - struct vhost_queue *vq; unsigned i; char ifname[PATH_MAX]; #ifdef RTE_LIBRTE_VHOST_NUMA @@ -580,21 +606,13 @@ new_device(int vid) eth_dev->data->numa_node = newnode; #endif - for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { - vq = eth_dev->data->rx_queues[i]; - if (vq == NULL) - continue; - vq->vid = vid; - vq->internal = internal; - vq->port = eth_dev->data->port_id; - } - for (i = 0; i < eth_dev->data->nb_tx_queues; i++) { - vq = eth_dev->data->tx_queues[i]; - if (vq == NULL) - continue; - vq->vid = vid; - vq->internal = internal; - vq->port = eth_dev->data->port_id; + internal->vid = vid; + if (eth_dev->data->rx_queues && eth_dev->data->tx_queues) { + queue_setup(eth_dev, internal); + rte_atomic32_set(&internal->dev_attached, 1); + } else { + RTE_LOG(INFO, PMD, "RX/TX queues have not setup yet\n"); + rte_atomic32_set(&internal->dev_attached, 0); } for (i = 0; i < rte_vhost_get_vring_num(vid); i++) @@ -604,7 +622,6 @@ new_device(int vid) eth_dev->data->dev_link.link_status = ETH_LINK_UP; - rte_atomic32_set(&internal->dev_attached, 1); update_queuing_status(eth_dev); RTE_LOG(INFO, PMD, "New connection established\n"); @@ -635,8 +652,9 @@ destroy_device(int vid) eth_dev = list->eth_dev; internal = eth_dev->data->dev_private; - rte_atomic32_set(&internal->dev_attached, 0); + rte_atomic32_set(&internal->started, 0); update_queuing_status(eth_dev); + rte_atomic32_set(&internal->dev_attached, 0); eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; @@ -773,12 +791,17 @@ rte_eth_vhost_get_vid_from_port_id(uint16_t port_id) } static int -eth_dev_start(struct rte_eth_dev *dev) +eth_dev_start(struct rte_eth_dev *eth_dev) { - struct pmd_internal *internal = dev->data->dev_private; + struct pmd_internal *internal = eth_dev->data->dev_private; + + if (unlikely(rte_atomic32_read(&internal->dev_attached) == 0)) { + queue_setup(eth_dev, internal); + rte_atomic32_set(&internal->dev_attached, 1); + } rte_atomic32_set(&internal->started, 1); - update_queuing_status(dev); + update_queuing_status(eth_dev); return 0; } -- 2.11.0