Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85615/?format=api
{ "id": 85615, "url": "https://patches.dpdk.org/api/patches/85615/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201221161456.31696-2-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20201221161456.31696-2-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201221161456.31696-2-maxime.coquelin@redhat.com", "date": "2020-12-21T16:14:54", "name": "[1/3] net/virtio: remove reference to virtqueue in vrings", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6860b900b4a1173fabb66495c4bbe415a41f16ef", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201221161456.31696-2-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14409, "url": "https://patches.dpdk.org/api/series/14409/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14409", "date": "2020-12-21T16:14:53", "name": "net/virtio: make virtqueue struct cache-friendly", "version": 1, "mbox": "https://patches.dpdk.org/series/14409/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/85615/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/85615/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 19FC4A09EF;\n\tMon, 21 Dec 2020 17:15:38 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 54F9CCAC7;\n\tMon, 21 Dec 2020 17:15:20 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by dpdk.org (Postfix) with ESMTP id 9CF54CAC4\n for <dev@dpdk.org>; Mon, 21 Dec 2020 17:15:17 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-231-5d7XLrrJN4i8iJYFKtjJMw-1; Mon, 21 Dec 2020 11:15:13 -0500", "from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com\n [10.5.11.13])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 902CF1800D42;\n Mon, 21 Dec 2020 16:15:12 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.46])\n by smtp.corp.redhat.com (Postfix) with ESMTP id D2C106E522;\n Mon, 21 Dec 2020 16:15:10 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1608567316;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=rtWUHV6brPGWxkXvvrAdmH5rxaAD7L89wQ46YZww27g=;\n b=WRY+XMsCGv2Rr6vubCg4nJVfBjQTyYDjdUWgThP4peo+Q9NhOiWzr/rdDWQKguvhEgaE9U\n dNR6zMOQtWuQAGJJ2xhGsODFEOmb7CTa1CKGqlU5hEuxQ1ljZ/GDtZOVISoFcQOAviUPqh\n MudseivE2Q0JBGw+jtyl2h9yqxMD7+Q=", "X-MC-Unique": "5d7XLrrJN4i8iJYFKtjJMw-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, amorenoz@redhat.com,\n david.marchand@redhat.com, olivier.matz@6wind.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Mon, 21 Dec 2020 17:14:54 +0100", "Message-Id": "<20201221161456.31696-2-maxime.coquelin@redhat.com>", "In-Reply-To": "<20201221161456.31696-1-maxime.coquelin@redhat.com>", "References": "<20201221161456.31696-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH 1/3] net/virtio: remove reference to virtqueue in\n\tvrings", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Vrings are part of the virtqueues, so we don't need\nto have a pointer to it in Vrings descriptions.\n\nInstead, let's just substract from its offset to\ncalculate virtqueue address.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 36 +++++++++----------\n drivers/net/virtio/virtio_rxtx.c | 28 +++++++--------\n drivers/net/virtio/virtio_rxtx.h | 3 --\n drivers/net/virtio/virtio_rxtx_packed_avx.c | 14 ++++----\n drivers/net/virtio/virtio_rxtx_simple.h | 2 +-\n .../net/virtio/virtio_rxtx_simple_altivec.c | 2 +-\n drivers/net/virtio/virtio_rxtx_simple_neon.c | 2 +-\n drivers/net/virtio/virtio_rxtx_simple_sse.c | 2 +-\n .../net/virtio/virtio_user/virtio_user_dev.c | 4 +--\n drivers/net/virtio/virtio_user_ethdev.c | 2 +-\n drivers/net/virtio/virtqueue.h | 6 +++-\n 11 files changed, 49 insertions(+), 52 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 96871b7b70..297c01a70d 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -133,7 +133,7 @@ virtio_send_command_packed(struct virtnet_ctl *cvq,\n \t\t\t struct virtio_pmd_ctrl *ctrl,\n \t\t\t int *dlen, int pkt_num)\n {\n-\tstruct virtqueue *vq = cvq->vq;\n+\tstruct virtqueue *vq = virtnet_cq_to_vq(cvq);\n \tint head;\n \tstruct vring_packed_desc *desc = vq->vq_packed.ring.desc;\n \tstruct virtio_pmd_ctrl *result;\n@@ -229,7 +229,7 @@ virtio_send_command_split(struct virtnet_ctl *cvq,\n \t\t\t int *dlen, int pkt_num)\n {\n \tstruct virtio_pmd_ctrl *result;\n-\tstruct virtqueue *vq = cvq->vq;\n+\tstruct virtqueue *vq = virtnet_cq_to_vq(cvq);\n \tuint32_t head, i;\n \tint k, sum = 0;\n \n@@ -316,13 +316,13 @@ virtio_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,\n \n \tctrl->status = status;\n \n-\tif (!cvq || !cvq->vq) {\n+\tif (!cvq) {\n \t\tPMD_INIT_LOG(ERR, \"Control queue is not supported.\");\n \t\treturn -1;\n \t}\n \n \trte_spinlock_lock(&cvq->lock);\n-\tvq = cvq->vq;\n+\tvq = virtnet_cq_to_vq(cvq);\n \n \tPMD_INIT_LOG(DEBUG, \"vq->vq_desc_head_idx = %d, status = %d, \"\n \t\t\"vq->hw->cvq = %p vq = %p\",\n@@ -552,19 +552,16 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \n \t\tvq->sw_ring = sw_ring;\n \t\trxvq = &vq->rxq;\n-\t\trxvq->vq = vq;\n \t\trxvq->port_id = dev->data->port_id;\n \t\trxvq->mz = mz;\n \t} else if (queue_type == VTNET_TQ) {\n \t\ttxvq = &vq->txq;\n-\t\ttxvq->vq = vq;\n \t\ttxvq->port_id = dev->data->port_id;\n \t\ttxvq->mz = mz;\n \t\ttxvq->virtio_net_hdr_mz = hdr_mz;\n \t\ttxvq->virtio_net_hdr_mem = hdr_mz->iova;\n \t} else if (queue_type == VTNET_CQ) {\n \t\tcvq = &vq->cq;\n-\t\tcvq->vq = vq;\n \t\tcvq->mz = mz;\n \t\tcvq->virtio_net_hdr_mz = hdr_mz;\n \t\tcvq->virtio_net_hdr_mem = hdr_mz->iova;\n@@ -851,7 +848,7 @@ virtio_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)\n {\n \tstruct virtio_hw *hw = dev->data->dev_private;\n \tstruct virtnet_rx *rxvq = dev->data->rx_queues[queue_id];\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \n \tvirtqueue_enable_intr(vq);\n \tvirtio_mb(hw->weak_barriers);\n@@ -862,7 +859,7 @@ static int\n virtio_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)\n {\n \tstruct virtnet_rx *rxvq = dev->data->rx_queues[queue_id];\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \n \tvirtqueue_disable_intr(vq);\n \treturn 0;\n@@ -2159,8 +2156,7 @@ static int\n virtio_dev_start(struct rte_eth_dev *dev)\n {\n \tuint16_t nb_queues, i;\n-\tstruct virtnet_rx *rxvq;\n-\tstruct virtnet_tx *txvq __rte_unused;\n+\tstruct virtqueue *vq;\n \tstruct virtio_hw *hw = dev->data->dev_private;\n \tint ret;\n \n@@ -2217,27 +2213,27 @@ virtio_dev_start(struct rte_eth_dev *dev)\n \tPMD_INIT_LOG(DEBUG, \"nb_queues=%d\", nb_queues);\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\trxvq = dev->data->rx_queues[i];\n+\t\tvq = virtnet_rxq_to_vq(dev->data->rx_queues[i]);\n \t\t/* Flush the old packets */\n-\t\tvirtqueue_rxvq_flush(rxvq->vq);\n-\t\tvirtqueue_notify(rxvq->vq);\n+\t\tvirtqueue_rxvq_flush(vq);\n+\t\tvirtqueue_notify(vq);\n \t}\n \n \tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n-\t\ttxvq = dev->data->tx_queues[i];\n-\t\tvirtqueue_notify(txvq->vq);\n+\t\tvq = virtnet_txq_to_vq(dev->data->tx_queues[i]);\n+\t\tvirtqueue_notify(vq);\n \t}\n \n \tPMD_INIT_LOG(DEBUG, \"Notified backend at initialization\");\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\trxvq = dev->data->rx_queues[i];\n-\t\tVIRTQUEUE_DUMP(rxvq->vq);\n+\t\tvq = virtnet_rxq_to_vq(dev->data->rx_queues[i]);\n+\t\tVIRTQUEUE_DUMP(vq);\n \t}\n \n \tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n-\t\ttxvq = dev->data->tx_queues[i];\n-\t\tVIRTQUEUE_DUMP(txvq->vq);\n+\t\tvq = virtnet_txq_to_vq(dev->data->tx_queues[i]);\n+\t\tVIRTQUEUE_DUMP(vq);\n \t}\n \n \tset_rxtx_funcs(dev);\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex aca6eb9cd0..1fcce36cbd 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -43,7 +43,7 @@ int\n virtio_dev_rx_queue_done(void *rxq, uint16_t offset)\n {\n \tstruct virtnet_rx *rxvq = rxq;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \n \treturn virtqueue_nused(vq) >= offset;\n }\n@@ -424,7 +424,7 @@ virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq,\n \t\t\tuint16_t num)\n {\n \tstruct vq_desc_extra *dxp;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct vring_desc *start_dp;\n \tstruct virtio_net_hdr *hdr;\n \tuint16_t idx;\n@@ -470,7 +470,7 @@ virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,\n \t\t\t\t struct rte_mbuf *cookie,\n \t\t\t\t int in_order)\n {\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct vring_packed_desc *dp;\n \tstruct vq_desc_extra *dxp;\n \tuint16_t idx, id, flags;\n@@ -524,7 +524,7 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n {\n \tstruct virtio_tx_region *txr = txvq->virtio_net_hdr_mz->addr;\n \tstruct vq_desc_extra *dxp;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct vring_desc *start_dp;\n \tuint16_t seg_num = cookie->nb_segs;\n \tuint16_t head_idx, idx;\n@@ -614,9 +614,9 @@ virtio_dev_cq_start(struct rte_eth_dev *dev)\n {\n \tstruct virtio_hw *hw = dev->data->dev_private;\n \n-\tif (hw->cvq && hw->cvq->vq) {\n+\tif (hw->cvq) {\n \t\trte_spinlock_init(&hw->cvq->lock);\n-\t\tVIRTQUEUE_DUMP((struct virtqueue *)hw->cvq->vq);\n+\t\tVIRTQUEUE_DUMP(virtnet_cq_to_vq(hw->cvq));\n \t}\n }\n \n@@ -948,7 +948,7 @@ uint16_t\n virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct rte_mbuf *rxm;\n \tuint16_t nb_used, num, nb_rx;\n@@ -1055,7 +1055,7 @@ virtio_recv_pkts_packed(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct rte_mbuf *rxm;\n \tuint16_t num, nb_rx;\n@@ -1158,7 +1158,7 @@ virtio_recv_pkts_inorder(void *rx_queue,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct rte_mbuf *rxm;\n \tstruct rte_mbuf *prev = NULL;\n@@ -1342,7 +1342,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct rte_mbuf *rxm;\n \tstruct rte_mbuf *prev = NULL;\n@@ -1520,7 +1520,7 @@ virtio_recv_mergeable_pkts_packed(void *rx_queue,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tstruct rte_mbuf *rxm;\n \tstruct rte_mbuf *prev = NULL;\n@@ -1731,7 +1731,7 @@ virtio_xmit_pkts_packed(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_tx *txvq = tx_queue;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_tx = 0;\n@@ -1812,7 +1812,7 @@ uint16_t\n virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n {\n \tstruct virtnet_tx *txvq = tx_queue;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_used, nb_tx = 0;\n@@ -1912,7 +1912,7 @@ virtio_xmit_pkts_inorder(void *tx_queue,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_tx *txvq = tx_queue;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t nb_used, nb_tx = 0, nb_inorder_pkts = 0;\ndiff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h\nindex 1eb8dae227..7f1036be6f 100644\n--- a/drivers/net/virtio/virtio_rxtx.h\n+++ b/drivers/net/virtio/virtio_rxtx.h\n@@ -18,7 +18,6 @@ struct virtnet_stats {\n };\n \n struct virtnet_rx {\n-\tstruct virtqueue *vq;\n \t/* dummy mbuf, for wraparound when processing RX ring. */\n \tstruct rte_mbuf fake_mbuf;\n \tuint64_t mbuf_initializer; /**< value to init mbufs. */\n@@ -34,7 +33,6 @@ struct virtnet_rx {\n };\n \n struct virtnet_tx {\n-\tstruct virtqueue *vq;\n \t/**< memzone to populate hdr. */\n \tconst struct rte_memzone *virtio_net_hdr_mz;\n \trte_iova_t virtio_net_hdr_mem; /**< hdr for each xmit packet */\n@@ -49,7 +47,6 @@ struct virtnet_tx {\n };\n \n struct virtnet_ctl {\n-\tstruct virtqueue *vq;\n \t/**< memzone to populate hdr. */\n \tconst struct rte_memzone *virtio_net_hdr_mz;\n \trte_iova_t virtio_net_hdr_mem; /**< hdr for each xmit packet */\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.c b/drivers/net/virtio/virtio_rxtx_packed_avx.c\nindex a3dcc01a43..31f6eac340 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed_avx.c\n+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.c\n@@ -82,7 +82,7 @@ static inline int\n virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,\n \t\t\t\t struct rte_mbuf **tx_pkts)\n {\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tuint16_t head_size = vq->hw->vtnet_hdr_size;\n \tuint16_t idx = vq->vq_avail_idx;\n \tstruct virtio_net_hdr *hdr;\n@@ -204,7 +204,7 @@ static inline int\n virtqueue_enqueue_single_packed_vec(struct virtnet_tx *txvq,\n \t\t\t\t struct rte_mbuf *txm)\n {\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint16_t slots, can_push = 0, use_indirect = 0;\n@@ -253,7 +253,7 @@ virtio_xmit_pkts_packed_vec(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_tx *txvq = tx_queue;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t nb_tx = 0;\n \tuint16_t remained;\n@@ -358,7 +358,7 @@ static inline uint16_t\n virtqueue_dequeue_batch_packed_vec(struct virtnet_rx *rxvq,\n \t\t\t\t struct rte_mbuf **rx_pkts)\n {\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t hdr_size = hw->vtnet_hdr_size;\n \tuint64_t addrs[PACKED_BATCH_SIZE];\n@@ -460,7 +460,7 @@ virtqueue_dequeue_single_packed_vec(struct virtnet_rx *rxvq,\n {\n \tuint16_t used_idx, id;\n \tuint32_t len;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint32_t hdr_size = hw->vtnet_hdr_size;\n \tstruct virtio_net_hdr *hdr;\n@@ -512,7 +512,7 @@ virtio_recv_refill_packed_vec(struct virtnet_rx *rxvq,\n \t\t\t struct rte_mbuf **cookie,\n \t\t\t uint16_t num)\n {\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct vring_packed_desc *start_dp = vq->vq_packed.ring.desc;\n \tuint16_t flags = vq->vq_packed.cached_flags;\n \tstruct virtio_hw *hw = vq->hw;\n@@ -568,7 +568,7 @@ virtio_recv_pkts_packed_vec(void *rx_queue,\n \t\t\t uint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t num, nb_rx = 0;\n \tuint32_t nb_enqueued = 0;\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.h b/drivers/net/virtio/virtio_rxtx_simple.h\nindex f2a5aedf97..f258771fcf 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.h\n+++ b/drivers/net/virtio/virtio_rxtx_simple.h\n@@ -23,7 +23,7 @@ virtio_rxq_rearm_vec(struct virtnet_rx *rxvq)\n \tstruct rte_mbuf **sw_ring;\n \tstruct vring_desc *start_dp;\n \tint ret;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \n \tdesc_idx = vq->vq_avail_idx & (vq->vq_nentries - 1);\n \tsw_ring = &vq->sw_ring[desc_idx];\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_altivec.c b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\nindex a260ebdf57..e1f3d8bdca 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n@@ -41,7 +41,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t nb_used, nb_total;\n \tuint16_t desc_idx;\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c\nindex 12e034dc0a..8307dda5a4 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c\n@@ -41,7 +41,7 @@ virtio_recv_pkts_vec(void *rx_queue,\n \t\tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t nb_used, nb_total;\n \tuint16_t desc_idx;\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c\nindex 1056e9c20b..c6191ce39e 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_sse.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c\n@@ -41,7 +41,7 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tuint16_t nb_pkts)\n {\n \tstruct virtnet_rx *rxvq = rx_queue;\n-\tstruct virtqueue *vq = rxvq->vq;\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \tstruct virtio_hw *hw = vq->hw;\n \tuint16_t nb_used, nb_total;\n \tuint16_t desc_idx;\ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex 154aecc209..dd60de1d74 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -846,13 +846,13 @@ virtio_user_dev_reset_queues_packed(struct rte_eth_dev *eth_dev)\n \t/* Vring reset for each Tx queue and Rx queue. */\n \tfor (i = 0; i < eth_dev->data->nb_rx_queues; i++) {\n \t\trxvq = eth_dev->data->rx_queues[i];\n-\t\tvirtqueue_rxvq_reset_packed(rxvq->vq);\n+\t\tvirtqueue_rxvq_reset_packed(virtnet_rxq_to_vq(rxvq));\n \t\tvirtio_dev_rx_queue_setup_finish(eth_dev, i);\n \t}\n \n \tfor (i = 0; i < eth_dev->data->nb_tx_queues; i++) {\n \t\ttxvq = eth_dev->data->tx_queues[i];\n-\t\tvirtqueue_txvq_reset_packed(txvq->vq);\n+\t\tvirtqueue_txvq_reset_packed(virtnet_txq_to_vq(txvq));\n \t}\n \n \thw->started = 1;\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex a287805cf2..3b8b14d704 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -249,7 +249,7 @@ virtio_user_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)\n \tuint64_t buf = 1;\n \tstruct virtio_user_dev *dev = virtio_user_get_dev(hw);\n \n-\tif (hw->cvq && (hw->cvq->vq == vq)) {\n+\tif (hw->cvq && (virtnet_cq_to_vq(hw->cvq) == vq)) {\n \t\tif (virtio_with_packed_queue(vq->hw))\n \t\t\tvirtio_user_handle_cq_packed(dev, vq->vq_queue_index);\n \t\telse\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 9274c48080..c64e7dcbdf 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -218,6 +218,10 @@ struct vq_desc_extra {\n \tuint16_t next;\n };\n \n+#define virtnet_rxq_to_vq(rxvq) container_of(rxvq, struct virtqueue, rxq)\n+#define virtnet_txq_to_vq(txvq) container_of(txvq, struct virtqueue, txq)\n+#define virtnet_cq_to_vq(cvq) container_of(cvq, struct virtqueue, cq)\n+\n struct virtqueue {\n \tstruct virtio_hw *hw; /**< virtio_hw structure pointer. */\n \tunion {\n@@ -668,7 +672,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n {\n \tstruct virtio_tx_region *txr = txvq->virtio_net_hdr_mz->addr;\n \tstruct vq_desc_extra *dxp;\n-\tstruct virtqueue *vq = txvq->vq;\n+\tstruct virtqueue *vq = virtnet_txq_to_vq(txvq);\n \tstruct vring_packed_desc *start_dp, *head_dp;\n \tuint16_t idx, id, head_idx, head_flags;\n \tint16_t head_size = vq->hw->vtnet_hdr_size;\n", "prefixes": [ "1/3" ] }