From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
To: dev@dpdk.org
Cc: Thomas Monjalon <thomas.monjalon@6wind.com>,
Tan Jianfeng <jianfeng.tan@intel.com>,
Kevin Traynor <ktraynor@redhat.com>,
Ilya Maximets <i.maximets@samsung.com>,
Kyle Larose <klarose@sandvine.com>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Yuanhan Liu <yuanhan.liu@linux.intel.com>
Subject: [dpdk-dev] [PATCH v2 03/10] net/virtio: simplify queue allocation
Date: Sat, 5 Nov 2016 17:40:58 +0800 [thread overview]
Message-ID: <1478338865-26126-4-git-send-email-yuanhan.liu@linux.intel.com> (raw)
In-Reply-To: <1478338865-26126-1-git-send-email-yuanhan.liu@linux.intel.com>
Let rxq/txq/cq be the union field of the virtqueue struct. This would
simplifies the vq allocation a bit: we don't need calculate the vq_size
any more based on the queue type.
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/net/virtio/virtio_ethdev.c | 18 +++++++-----------
drivers/net/virtio/virtqueue.h | 7 +++++++
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index d082df5..5a2c14b 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -312,7 +312,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
struct virtnet_tx *txvq = NULL;
struct virtnet_ctl *cvq = NULL;
struct virtqueue *vq;
- size_t sz_vq, sz_q = 0, sz_hdr_mz = 0;
+ size_t sz_hdr_mz = 0;
void *sw_ring = NULL;
int ret;
@@ -337,25 +337,21 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
snprintf(vq_name, sizeof(vq_name), "port%d_vq%d",
dev->data->port_id, vtpci_queue_idx);
- sz_vq = RTE_ALIGN_CEIL(sizeof(*vq) +
+ size = RTE_ALIGN_CEIL(sizeof(*vq) +
vq_size * sizeof(struct vq_desc_extra),
RTE_CACHE_LINE_SIZE);
- if (queue_type == VTNET_RQ) {
- sz_q = sz_vq + sizeof(*rxvq);
- } else if (queue_type == VTNET_TQ) {
- sz_q = sz_vq + sizeof(*txvq);
+ if (queue_type == VTNET_TQ) {
/*
* For each xmit packet, allocate a virtio_net_hdr
* and indirect ring elements
*/
sz_hdr_mz = vq_size * sizeof(struct virtio_tx_region);
} else if (queue_type == VTNET_CQ) {
- sz_q = sz_vq + sizeof(*cvq);
/* Allocate a page for control vq command, data and status */
sz_hdr_mz = PAGE_SIZE;
}
- vq = rte_zmalloc_socket(vq_name, sz_q, RTE_CACHE_LINE_SIZE, socket_id);
+ vq = rte_zmalloc_socket(vq_name, size, RTE_CACHE_LINE_SIZE, socket_id);
if (vq == NULL) {
PMD_INIT_LOG(ERR, "can not allocate vq");
return -ENOMEM;
@@ -425,14 +421,14 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
}
vq->sw_ring = sw_ring;
- rxvq = (struct virtnet_rx *)RTE_PTR_ADD(vq, sz_vq);
+ rxvq = &vq->rxq;
rxvq->vq = vq;
rxvq->port_id = dev->data->port_id;
rxvq->queue_id = queue_idx;
rxvq->mz = mz;
*pvq = rxvq;
} else if (queue_type == VTNET_TQ) {
- txvq = (struct virtnet_tx *)RTE_PTR_ADD(vq, sz_vq);
+ txvq = &vq->txq;
txvq->vq = vq;
txvq->port_id = dev->data->port_id;
txvq->queue_id = queue_idx;
@@ -442,7 +438,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
*pvq = txvq;
} else if (queue_type == VTNET_CQ) {
- cvq = (struct virtnet_ctl *)RTE_PTR_ADD(vq, sz_vq);
+ cvq = &vq->cq;
cvq->vq = vq;
cvq->mz = mz;
cvq->virtio_net_hdr_mz = hdr_mz;
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index ef0027b..bbeb2f2 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -44,6 +44,7 @@
#include "virtio_pci.h"
#include "virtio_ring.h"
#include "virtio_logs.h"
+#include "virtio_rxtx.h"
struct rte_mbuf;
@@ -191,6 +192,12 @@ struct virtqueue {
void *vq_ring_virt_mem; /**< linear address of vring*/
unsigned int vq_ring_size;
+ union {
+ struct virtnet_rx rxq;
+ struct virtnet_tx txq;
+ struct virtnet_ctl cq;
+ };
+
phys_addr_t vq_ring_mem; /**< physical address of vring,
* or virtual address for virtio_user. */
--
1.9.0
next prev parent reply other threads:[~2016-11-05 9:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-03 16:09 [dpdk-dev] [PATCH 0/8] net/virtio: fix queue reconfigure issue Yuanhan Liu
2016-11-03 16:09 ` [dpdk-dev] [PATCH 1/8] net/virtio: revert "virtio: fix restart" Yuanhan Liu
2016-11-03 20:36 ` Maxime Coquelin
2016-11-04 2:00 ` Yuanhan Liu
2016-11-04 8:09 ` Maxime Coquelin
2016-11-04 14:28 ` Yuanhan Liu
2016-11-04 8:10 ` Maxime Coquelin
2016-11-03 16:09 ` [dpdk-dev] [PATCH 2/8] net/virtio: simplify queue memzone name Yuanhan Liu
2016-11-03 20:41 ` Maxime Coquelin
2016-11-03 16:09 ` [dpdk-dev] [PATCH 3/8] net/virtio: simplify queue allocation Yuanhan Liu
2016-11-03 20:48 ` Maxime Coquelin
2016-11-04 1:51 ` Yuanhan Liu
2016-11-03 16:09 ` [dpdk-dev] [PATCH 4/8] net/virtio: allocate queue at init stage Yuanhan Liu
2016-11-03 21:11 ` Maxime Coquelin
2016-11-04 1:50 ` Yuanhan Liu
2016-11-04 8:08 ` Maxime Coquelin
2016-11-04 8:25 ` Maxime Coquelin
2016-11-04 15:21 ` Kevin Traynor
2016-11-04 20:30 ` Kevin Traynor
2016-11-05 6:15 ` Yuanhan Liu
2016-11-03 16:09 ` [dpdk-dev] [PATCH 5/8] net/virtio: initiate vring " Yuanhan Liu
2016-11-04 8:34 ` Maxime Coquelin
2016-11-03 16:09 ` [dpdk-dev] [PATCH 6/8] net/virtio: move queue configure code to proper place Yuanhan Liu
2016-11-04 8:39 ` Maxime Coquelin
2016-11-03 16:09 ` [dpdk-dev] [PATCH 7/8] net/virtio: complete init stage at the right place Yuanhan Liu
2016-11-04 8:44 ` Maxime Coquelin
2016-11-03 16:10 ` [dpdk-dev] [PATCH 8/8] net/virtio: remove started field Yuanhan Liu
2016-11-04 8:46 ` Maxime Coquelin
2016-11-05 9:40 ` [dpdk-dev] [PATCH v2 00/10] net/virtio: fix queue reconfigure issue Yuanhan Liu
2016-11-05 9:40 ` [dpdk-dev] [PATCH v2 01/10] net/virtio: revert fix restart Yuanhan Liu
2016-11-05 9:40 ` [dpdk-dev] [PATCH v2 02/10] net/virtio: simplify queue memzone name Yuanhan Liu
2016-11-05 9:40 ` Yuanhan Liu [this message]
2016-11-05 9:40 ` [dpdk-dev] [PATCH v2 04/10] net/virtio: allocate queue at init stage Yuanhan Liu
2016-11-07 14:23 ` Thomas Monjalon
2016-11-05 9:41 ` [dpdk-dev] [PATCH v2 05/10] net/virtio: initiate vring " Yuanhan Liu
2016-11-05 9:41 ` [dpdk-dev] [PATCH v2 06/10] net/virtio: move queue configure code to proper place Yuanhan Liu
2016-11-05 9:41 ` [dpdk-dev] [PATCH v2 07/10] net/virtio: complete init stage at the right place Yuanhan Liu
2016-11-05 9:41 ` [dpdk-dev] [PATCH v2 08/10] net/virtio: remove started field Yuanhan Liu
2016-11-05 9:41 ` [dpdk-dev] [PATCH v2 09/10] net/virtio: fix less queues being enabled issue Yuanhan Liu
2016-11-05 9:41 ` [dpdk-dev] [PATCH v2 10/10] net/virtio: fix multiple queue enabling Yuanhan Liu
2016-11-07 9:25 ` Yuanhan Liu
2016-11-07 14:44 ` [dpdk-dev] [PATCH v2 00/10] net/virtio: fix queue reconfigure issue Thomas Monjalon
2016-11-07 15:05 ` Yao, Lei A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478338865-26126-4-git-send-email-yuanhan.liu@linux.intel.com \
--to=yuanhan.liu@linux.intel.com \
--cc=dev@dpdk.org \
--cc=i.maximets@samsung.com \
--cc=jianfeng.tan@intel.com \
--cc=klarose@sandvine.com \
--cc=ktraynor@redhat.com \
--cc=maxime.coquelin@redhat.com \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).