From: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
To: dev@dpdk.org
Subject: [PATCH v3 2/4] port: changed tx_bulk implementation if ring_writer port
Date: Thu, 21 May 2015 14:28:42 +0200 [thread overview]
Message-ID: <1432211324-5078-3-git-send-email-maciejx.t.gajdzica@intel.com> (raw)
In-Reply-To: <1432211324-5078-1-git-send-email-maciejx.t.gajdzica@intel.com>
New implementation sends burst without copying data to internal buffer
if it is possible. It is similar to tx_bulk function in ethdev_writer
port.
Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
lib/librte_port/rte_port_ring.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c
index fa3d77b..ba1fdcb 100644
--- a/lib/librte_port/rte_port_ring.c
+++ b/lib/librte_port/rte_port_ring.c
@@ -101,6 +101,7 @@ struct rte_port_ring_writer {
struct rte_ring *ring;
uint32_t tx_burst_sz;
uint32_t tx_buf_count;
+ uint64_t bsz_mask;
};
static void *
@@ -130,6 +131,7 @@ rte_port_ring_writer_create(void *params, int socket_id)
port->ring = conf->ring;
port->tx_burst_sz = conf->tx_burst_sz;
port->tx_buf_count = 0;
+ port->bsz_mask = 1LLU << (conf->tx_burst_sz - 1);
return port;
}
@@ -165,18 +167,27 @@ rte_port_ring_writer_tx_bulk(void *port,
struct rte_mbuf **pkts,
uint64_t pkts_mask)
{
- struct rte_port_ring_writer *p = (struct rte_port_ring_writer *) port;
+ struct rte_port_ring_writer *p =
+ (struct rte_port_ring_writer *) port;
+
+ uint32_t bsz_mask = p->bsz_mask;
+ uint32_t tx_buf_count = p->tx_buf_count;
+ uint64_t expr = (pkts_mask & (pkts_mask + 1)) |
+ ((pkts_mask & bsz_mask) ^ bsz_mask);
- if ((pkts_mask & (pkts_mask + 1)) == 0) {
+ if (expr == 0) {
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
- uint32_t i;
+ uint32_t n_pkts_ok;
+
+ if (tx_buf_count)
+ send_burst(p);
- for (i = 0; i < n_pkts; i++) {
- struct rte_mbuf *pkt = pkts[i];
+ n_pkts_ok = rte_ring_sp_enqueue_burst(p->ring, (void **)pkts, n_pkts);
- p->tx_buf[p->tx_buf_count++] = pkt;
- if (p->tx_buf_count >= p->tx_burst_sz)
- send_burst(p);
+ for ( ; n_pkts_ok < n_pkts; n_pkts_ok++) {
+ struct rte_mbuf *pkt = pkts[n_pkts_ok];
+
+ rte_pktmbuf_free(pkt);
}
} else {
for ( ; pkts_mask; ) {
@@ -184,11 +195,13 @@ rte_port_ring_writer_tx_bulk(void *port,
uint64_t pkt_mask = 1LLU << pkt_index;
struct rte_mbuf *pkt = pkts[pkt_index];
- p->tx_buf[p->tx_buf_count++] = pkt;
- if (p->tx_buf_count >= p->tx_burst_sz)
- send_burst(p);
+ p->tx_buf[tx_buf_count++] = pkt;
pkts_mask &= ~pkt_mask;
}
+
+ p->tx_buf_count = tx_buf_count;
+ if (tx_buf_count >= p->tx_burst_sz)
+ send_burst(p);
}
return 0;
--
1.7.9.5
next prev parent reply other threads:[~2015-05-21 12:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 12:28 [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Maciej Gajdzica
2015-05-21 12:28 ` [PATCH v3 1/4] port: removed second implementation of tx_bulk from ethdev_writer port Maciej Gajdzica
2015-05-21 12:28 ` Maciej Gajdzica [this message]
2015-05-21 12:28 ` [PATCH v3 3/4] port: added ethdev_writer_nodrop port Maciej Gajdzica
2015-05-21 12:28 ` [PATCH v3 4/4] port: added ring_writer_nodrop port Maciej Gajdzica
2015-05-21 16:30 ` [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Dumitrescu, Cristian
2015-06-18 14:42 ` Thomas Monjalon
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=1432211324-5078-3-git-send-email-maciejx.t.gajdzica@intel.com \
--to=maciejx.t.gajdzica@intel.com \
--cc=dev@dpdk.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.