From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id C1415235 for ; Tue, 21 Nov 2017 14:24:55 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 74EF120696; Tue, 21 Nov 2017 08:24:55 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:24:55 -0500 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=fm1; bh=NABtTI2s/b29ikjoS b28MLbmkZDKdUhc1MJXpnApQio=; b=r/zfxxL3OO+Ho/FWa5BynZtdTUdDUGq6E a+Kis5hGGpeBE3gNnC26x5unceev4KM8DClH7ZLo2YQz0Eq2J03VXfckKKipn+6J jVHqnpwBZdBTiTzfHzBYH1Lufb26IzQO/8Ab9b2u+FTQgFwRd7HTs7ka5EFlocNa ebmATcpcdXXrFPPpoJnx0NX+KjeCg+uYBdNJLtSNpJpDvo1F22SxuPAZUGrbSbfm dWVUfvSR7vCG56BzLBz2L4v+bEA+5fDrpSxKCbxSWualUb5mcd49KfChuJsnogx4 csekIDq8/rhMqCGWg4UuWAvryWvn3xnLjiIsYUSegX9ZSAAZLdk3g== 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= fm1; bh=NABtTI2s/b29ikjoSb28MLbmkZDKdUhc1MJXpnApQio=; b=Ka9RNTvB ldIzDeu/uIBP8ztb0novglJsHd/94qpIJnps/PHZhGYDSCBWha4UJrxvz0/iYib8 44BYZ3JwBj9mtNUcQgTkuboMosRhvgGQC0r0eLt6liPjtolVf5wohB9pt3Qx3UBD /ISGeKb2R/JhDxCGvCPP1X3/iybvI1WB4ZEbWI3tOWJuKJrNsB4ctudaJAKAte2Y mK6Z2hwLPUnl0/b7ajwcvkUjVzRlg0jpGsc9P6juqR+gyOUGc4OwLtMdiTR3P5FN bgO4vMovHcVt6DYHRjYH5v/Oq3Z8lGxFatESjn3SuKUGydouQk5tAmQgzx0Rve7A saaT1sp/wEdPug== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id EFE7B24B36; Tue, 21 Nov 2017 08:24:52 -0500 (EST) From: Yuanhan Liu To: Olivier Matz Cc: Yuanhan Liu , dpdk stable Date: Tue, 21 Nov 2017 21:17:09 +0800 Message-Id: <1511270333-31002-87-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/virtio: fix queue setup consistency' has been queued to stable release 17.08.1 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: Tue, 21 Nov 2017 13:24:56 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From a2c2c20a2db84f6eab7c7d889c4593a1c68fd0b6 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 7 Sep 2017 14:13:43 +0200 Subject: [PATCH] net/virtio: fix queue setup consistency [ upstream commit efc83a1e7fc319876835738871bf968e7ed5c935 ] In rx/tx queue setup functions, some code is executed only if use_simple_rxtx == 1. The value of this variable can change depending on the offload flags or sse support. If Rx queue setup is called before Tx queue setup, it can result in an invalid configuration: - dev_configure is called: use_simple_rxtx is initialized to 0 - rx queue setup is called: queues are initialized without simple path support - tx queue setup is called: use_simple_rxtx switch to 1, and simple Rx/Tx handlers are selected Fix this by postponing a part of Rx/Tx queue initialization in dev_start(), as it was the case in the initial implementation. Fixes: 48cec290a3d2 ("net/virtio: move queue configure code to proper place") Signed-off-by: Olivier Matz Acked-by: Yuanhan Liu --- drivers/net/virtio/virtio_ethdev.c | 13 +++++++++++++ drivers/net/virtio/virtio_ethdev.h | 6 ++++++ drivers/net/virtio/virtio_rxtx.c | 40 ++++++++++++++++++++++++++++++-------- 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 8eee3ff..c7888f1 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1737,6 +1737,19 @@ virtio_dev_start(struct rte_eth_dev *dev) struct virtnet_rx *rxvq; struct virtnet_tx *txvq __rte_unused; struct virtio_hw *hw = dev->data->dev_private; + int ret; + + /* Finish the initialization of the queues */ + for (i = 0; i < dev->data->nb_rx_queues; i++) { + ret = virtio_dev_rx_queue_setup_finish(dev, i); + if (ret < 0) + return ret; + } + for (i = 0; i < dev->data->nb_tx_queues; i++) { + ret = virtio_dev_tx_queue_setup_finish(dev, i); + if (ret < 0) + return ret; + } /* check if lsc interrupt feature is enabled */ if (dev->data->dev_conf.intr_conf.lsc) { diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h index c3413c6..2039bc5 100644 --- a/drivers/net/virtio/virtio_ethdev.h +++ b/drivers/net/virtio/virtio_ethdev.h @@ -92,10 +92,16 @@ int virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mb_pool); +int virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, + uint16_t rx_queue_id); + int virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, unsigned int socket_id, const struct rte_eth_txconf *tx_conf); +int virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev, + uint16_t tx_queue_id); + uint16_t virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index e30377c..a32e322 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -421,9 +421,6 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, struct virtio_hw *hw = dev->data->dev_private; struct virtqueue *vq = hw->vqs[vtpci_queue_idx]; struct virtnet_rx *rxvq; - int error, nbufs; - struct rte_mbuf *m; - uint16_t desc_idx; PMD_INIT_FUNC_TRACE(); @@ -440,10 +437,24 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, } dev->data->rx_queues[queue_idx] = rxvq; + return 0; +} + +int +virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx) +{ + uint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX; + struct virtio_hw *hw = dev->data->dev_private; + struct virtqueue *vq = hw->vqs[vtpci_queue_idx]; + struct virtnet_rx *rxvq = &vq->rxq; + struct rte_mbuf *m; + uint16_t desc_idx; + int error, nbufs; + + PMD_INIT_FUNC_TRACE(); /* Allocate blank mbufs for the each rx descriptor */ nbufs = 0; - error = ENOSPC; if (hw->use_simple_rxtx) { for (desc_idx = 0; desc_idx < vq->vq_nentries; @@ -534,7 +545,6 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, struct virtqueue *vq = hw->vqs[vtpci_queue_idx]; struct virtnet_tx *txvq; uint16_t tx_free_thresh; - uint16_t desc_idx; PMD_INIT_FUNC_TRACE(); @@ -563,9 +573,24 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, vq->vq_free_thresh = tx_free_thresh; - if (hw->use_simple_rxtx) { - uint16_t mid_idx = vq->vq_nentries >> 1; + dev->data->tx_queues[queue_idx] = txvq; + return 0; +} + +int +virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev, + uint16_t queue_idx) +{ + uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX; + struct virtio_hw *hw = dev->data->dev_private; + struct virtqueue *vq = hw->vqs[vtpci_queue_idx]; + uint16_t mid_idx = vq->vq_nentries >> 1; + struct virtnet_tx *txvq = &vq->txq; + uint16_t desc_idx; + PMD_INIT_FUNC_TRACE(); + + if (hw->use_simple_rxtx) { for (desc_idx = 0; desc_idx < mid_idx; desc_idx++) { vq->vq_ring.avail->ring[desc_idx] = desc_idx + mid_idx; @@ -587,7 +612,6 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, VIRTQUEUE_DUMP(vq); - dev->data->tx_queues[queue_idx] = txvq; return 0; } -- 2.7.4