From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id B73721B287 for ; Mon, 30 Oct 2017 16:37:56 +0100 (CET) Received: by mail-wr0-f193.google.com with SMTP id p96so13019087wrb.7 for ; Mon, 30 Oct 2017 08:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XxUIVep2rAlvdIRum0LeoFHg4K1UnYr8mM0FaDTa0tM=; b=CdEBvp4lGNqetXVX6owAc7fci4Q2pKrAMdcfDJudwO46ftZfTftoK+xnL+zLajGEuV yylvRpUVSm07yh1+PJGhnCn29cTArONV2l65HEZjJmjQC9sD9S3zQnA7ReKRrDWmUbMZ ybGKYG4tjazhrhuRLslNxpNeQht55Y+0PRGRktRR1Xt1bhqFef6tZs+Gu5lze1Nwake1 tApD0oxC+iqX85d/biJS9x1yZlbNdhD8VLrjGgeY3AOVloCX5mruZTRGWgCPTBAUTa7E Vt1zgZAG8az4blak7uJVtJQzgHuiZ925OP9xUFl+C+XWjPyP76Ulnhjwo+tYzaa9nq5y HO8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XxUIVep2rAlvdIRum0LeoFHg4K1UnYr8mM0FaDTa0tM=; b=Zu97LDPy7zRMPFlTcer9R38Xs8OdBvTwzLbyMW7Pp1Fdk1YMIUKtzv1QBTJtp1tNlr 5S9meQWWO6AHrXGRqJe+0Z4h2c67juxaeYUf71qpMbmI8V4t6rhOS2vZA6rWdDF1fAW4 L/nGrr/W3jKQ7MeqpqAy9cH75CFgB6ivhihZ+2YLZIplSlxaVrlOWS4uEip0+2fA28Nd UdN9ocbmDmN9I10XL5Rj3ROKHYC7YmavEXrzhZhT1GBlz3xlp+o8eij8EhJawLZYpx3D udiFUQ+FGv/0p09ARTy/jD+sW3gWuCIWvWMvKGsJINAQhEeWPb0ZpUpIC7xO+m76lYxC vkZw== X-Gm-Message-State: AMCzsaXTcwtYSQeZ+qoeupwksPPWrtl2WRU5aE/sTCArRjP1IKyEd5Gl C53BBsQdfuM8CoNKqCDa7h+e1TKkVSA= X-Google-Smtp-Source: ABhQp+RhAziLfI21YSB0TizkMzQB9ANB07kh0WggSfB059gToOv90Z69lQaYN0p/fnPJ/HosAbg4+Q== X-Received: by 10.223.200.134 with SMTP id k6mr7541428wrh.159.1509377876360; Mon, 30 Oct 2017 08:37:56 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id q74sm12159223wrb.51.2017.10.30.08.37.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:37:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Yuanhan Liu , dpdk stable Date: Mon, 30 Oct 2017 15:34:46 +0000 Message-Id: <20171030153511.13322-43-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/virtio: fix queue setup consistency' has been queued to LTS release 16.11.4 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: Mon, 30 Oct 2017 15:37:56 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 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/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From 29113fef0f37476ba992e00ad17cd23a7eb6ac89 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 67ebb1e5b..6903368db 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1523,6 +1523,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 4feccf939..c491ec1b0 100644 --- a/drivers/net/virtio/virtio_ethdev.h +++ b/drivers/net/virtio/virtio_ethdev.h @@ -88,10 +88,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 a33ef1a88..ad582f3e5 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -412,9 +412,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(); @@ -431,10 +428,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; @@ -525,7 +536,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(); @@ -554,9 +564,24 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, vq->vq_free_thresh = tx_free_thresh; + 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) { - uint16_t mid_idx = vq->vq_nentries >> 1; - for (desc_idx = 0; desc_idx < mid_idx; desc_idx++) { vq->vq_ring.avail->ring[desc_idx] = desc_idx + mid_idx; @@ -578,7 +603,6 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, VIRTQUEUE_DUMP(vq); - dev->data->tx_queues[queue_idx] = txvq; return 0; } -- 2.11.0