From: Stephen Hemminger <stephen@networkplumber.org>
To: huawei.xie@intel.com, changchun.ouyang@intel.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 5/5] virtio: optimize transmit enqueue
Date: Sun, 18 Oct 2015 22:16:12 -0700 [thread overview]
Message-ID: <1445231772-17467-6-git-send-email-stephen@networkplumber.org> (raw)
In-Reply-To: <1445231772-17467-1-git-send-email-stephen@networkplumber.org>
All the error checks in virtqueue_enqueue_xmit are already done
by the caller. Therefore they can be removed to improve performance.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/virtio/virtio_rxtx.c | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index dbedcc3..8fa0dd7 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -198,7 +198,7 @@ virtqueue_enqueue_recv_refill(struct virtqueue *vq, struct rte_mbuf *cookie)
return 0;
}
-static int
+static inline void
virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,
uint16_t needed, int use_indirect, int can_push)
{
@@ -209,14 +209,7 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,
uint16_t head_size = txvq->hw->vtnet_hdr_size;
unsigned long offs;
- if (unlikely(txvq->vq_free_cnt == 0))
- return -ENOSPC;
- if (unlikely(txvq->vq_free_cnt < needed))
- return -EMSGSIZE;
head_idx = txvq->vq_desc_head_idx;
- if (unlikely(head_idx >= txvq->vq_nentries))
- return -EFAULT;
-
idx = head_idx;
dxp = &txvq->vq_descx[idx];
dxp->cookie = (void *)cookie;
@@ -267,8 +260,6 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie,
txvq->vq_desc_tail_idx = idx;
txvq->vq_free_cnt = (uint16_t)(txvq->vq_free_cnt - needed);
vq_update_avail_ring(txvq, head_idx);
-
- return 0;
}
static inline struct rte_mbuf *
@@ -828,17 +819,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
}
/* Enqueue Packet buffers */
- error = virtqueue_enqueue_xmit(txvq, txm, slots,
- use_indirect, can_push);
- if (unlikely(error)) {
- if (error == ENOSPC)
- PMD_TX_LOG(ERR, "virtqueue_enqueue Free count = 0");
- else if (error == EMSGSIZE)
- PMD_TX_LOG(ERR, "virtqueue_enqueue Free count < 1");
- else
- PMD_TX_LOG(ERR, "virtqueue_enqueue error: %d", error);
- break;
- }
+ virtqueue_enqueue_xmit(txvq, txm, slots, use_indirect, can_push);
txvq->bytes += txm->pkt_len;
++txvq->packets;
}
--
2.1.4
next prev parent reply other threads:[~2015-10-19 5:16 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 5:16 [dpdk-dev] [PATCH v2 0/5] virtio: Tx performance improvements Stephen Hemminger
2015-10-19 5:16 ` [dpdk-dev] [PATCH 1/5] virtio: clean up space checks on xmit Stephen Hemminger
2015-10-19 8:02 ` Xie, Huawei
2015-10-19 15:48 ` Stephen Hemminger
2015-10-19 16:27 ` Xie, Huawei
2015-10-19 5:16 ` [dpdk-dev] [PATCH 2/5] virtio: don't use unlikely for normal tx stuff Stephen Hemminger
2015-10-19 5:16 ` [dpdk-dev] [PATCH 3/5] virtio: use indirect ring elements Stephen Hemminger
2015-10-19 13:19 ` Xie, Huawei
2015-10-19 15:47 ` Stephen Hemminger
2015-10-19 16:18 ` Xie, Huawei
2015-10-30 18:01 ` Thomas Monjalon
2015-10-19 5:16 ` [dpdk-dev] [PATCH 4/5] virtio: use any layout on transmit Stephen Hemminger
2015-10-19 16:28 ` Xie, Huawei
2015-10-19 16:43 ` Stephen Hemminger
2015-10-19 16:56 ` Xie, Huawei
2015-10-26 23:47 ` Stephen Hemminger
2015-10-19 17:19 ` Stephen Hemminger
2015-10-19 5:16 ` Stephen Hemminger [this message]
2015-10-20 1:48 ` [dpdk-dev] [PATCH 5/5] virtio: optimize transmit enqueue Xie, Huawei
2015-10-21 13:18 ` [dpdk-dev] [PATCH v2 0/5] virtio: Tx performance improvements Thomas Monjalon
2015-10-22 10:38 ` Xie, Huawei
2015-10-22 12:13 ` Xie, Huawei
2015-10-22 16:04 ` Stephen Hemminger
2015-10-23 9:00 ` Xie, Huawei
2015-10-26 23:52 ` Stephen Hemminger
2015-10-27 1:56 ` Xie, Huawei
2015-10-27 2:23 ` Stephen Hemminger
2015-10-27 2:38 ` Xie, Huawei
2015-10-26 14:05 ` Xie, Huawei
2016-01-05 8:10 ` Xie, Huawei
2016-01-06 12:03 ` Thomas Monjalon
2016-01-14 13:49 ` Xie, Huawei
2016-03-04 6:18 ` Xie, Huawei
2016-03-04 18:17 ` Stephen Hemminger
2016-03-08 1:38 ` Xie, Huawei
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=1445231772-17467-6-git-send-email-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=changchun.ouyang@intel.com \
--cc=dev@dpdk.org \
--cc=huawei.xie@intel.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).