* [dpdk-dev] [PATCH v3 1/4] port: removed second implementation of tx_bulk from ethdev_writer port
2015-05-21 12:28 [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Maciej Gajdzica
@ 2015-05-21 12:28 ` Maciej Gajdzica
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 2/4] port: changed tx_bulk implementation if ring_writer port Maciej Gajdzica
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Maciej Gajdzica @ 2015-05-21 12:28 UTC (permalink / raw)
To: dev
There was two implementations of tx_bulk function in ethdev_writer port.
The function to run is chosen with WRITER_APPROACH define. This patch
removes WRITER_APPROACH = 0 implementation, as it seems to be slower.
Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
lib/librte_port/rte_port_ethdev.c | 47 -------------------------------------
1 file changed, 47 deletions(-)
diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c
index d014913..55ed829 100644
--- a/lib/librte_port/rte_port_ethdev.c
+++ b/lib/librte_port/rte_port_ethdev.c
@@ -99,8 +99,6 @@ rte_port_ethdev_reader_free(void *port)
/*
* Port ETHDEV Writer
*/
-#define RTE_PORT_ETHDEV_WRITER_APPROACH 1
-
struct rte_port_ethdev_writer {
struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX];
uint32_t tx_burst_sz;
@@ -171,45 +169,6 @@ rte_port_ethdev_writer_tx(void *port, struct rte_mbuf *pkt)
return 0;
}
-#if RTE_PORT_ETHDEV_WRITER_APPROACH == 0
-
-static int
-rte_port_ethdev_writer_tx_bulk(void *port,
- struct rte_mbuf **pkts,
- uint64_t pkts_mask)
-{
- struct rte_port_ethdev_writer *p =
- (struct rte_port_ethdev_writer *) port;
-
- if ((pkts_mask & (pkts_mask + 1)) == 0) {
- uint64_t n_pkts = __builtin_popcountll(pkts_mask);
- uint32_t i;
-
- for (i = 0; i < n_pkts; i++) {
- struct rte_mbuf *pkt = pkts[i];
-
- p->tx_buf[p->tx_buf_count++] = pkt;
- if (p->tx_buf_count >= p->tx_burst_sz)
- send_burst(p);
- }
- } else {
- for ( ; pkts_mask; ) {
- uint32_t pkt_index = __builtin_ctzll(pkts_mask);
- 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);
- pkts_mask &= ~pkt_mask;
- }
- }
-
- return 0;
-}
-
-#elif RTE_PORT_ETHDEV_WRITER_APPROACH == 1
-
static int
rte_port_ethdev_writer_tx_bulk(void *port,
struct rte_mbuf **pkts,
@@ -255,12 +214,6 @@ rte_port_ethdev_writer_tx_bulk(void *port,
return 0;
}
-#else
-
-#error Invalid value for RTE_PORT_ETHDEV_WRITER_APPROACH
-
-#endif
-
static int
rte_port_ethdev_writer_flush(void *port)
{
--
1.7.9.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [dpdk-dev] [PATCH v3 2/4] port: changed tx_bulk implementation if ring_writer port
2015-05-21 12:28 [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Maciej Gajdzica
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 1/4] port: removed second implementation of tx_bulk from ethdev_writer port Maciej Gajdzica
@ 2015-05-21 12:28 ` Maciej Gajdzica
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 3/4] port: added ethdev_writer_nodrop port Maciej Gajdzica
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Maciej Gajdzica @ 2015-05-21 12:28 UTC (permalink / raw)
To: dev
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [dpdk-dev] [PATCH v3 3/4] port: added ethdev_writer_nodrop port
2015-05-21 12:28 [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Maciej Gajdzica
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 1/4] port: removed second implementation of tx_bulk from ethdev_writer port Maciej Gajdzica
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 2/4] port: changed tx_bulk implementation if ring_writer port Maciej Gajdzica
@ 2015-05-21 12:28 ` Maciej Gajdzica
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 4/4] port: added ring_writer_nodrop port Maciej Gajdzica
2015-05-21 16:30 ` [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Dumitrescu, Cristian
4 siblings, 0 replies; 7+ messages in thread
From: Maciej Gajdzica @ 2015-05-21 12:28 UTC (permalink / raw)
To: dev
When ethdev_writer_nodrop port fails to send data, it tries to resend.
Operation is aborted when maximum number of retries is reached.
Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
lib/librte_port/rte_port_ethdev.c | 183 +++++++++++++++++++++++++++++++++++++
lib/librte_port/rte_port_ethdev.h | 19 ++++
2 files changed, 202 insertions(+)
diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c
index 55ed829..39ed72d 100644
--- a/lib/librte_port/rte_port_ethdev.c
+++ b/lib/librte_port/rte_port_ethdev.c
@@ -31,6 +31,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
+#include <stdint.h>
#include <rte_mbuf.h>
#include <rte_ethdev.h>
@@ -241,6 +242,180 @@ rte_port_ethdev_writer_free(void *port)
}
/*
+ * Port ETHDEV Writer Nodrop
+ */
+struct rte_port_ethdev_writer_nodrop {
+ struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX];
+ uint32_t tx_burst_sz;
+ uint16_t tx_buf_count;
+ uint64_t bsz_mask;
+ uint64_t n_retries;
+ uint16_t queue_id;
+ uint8_t port_id;
+};
+
+static void *
+rte_port_ethdev_writer_nodrop_create(void *params, int socket_id)
+{
+ struct rte_port_ethdev_writer_nodrop_params *conf =
+ (struct rte_port_ethdev_writer_nodrop_params *) params;
+ struct rte_port_ethdev_writer_nodrop *port;
+
+ /* Check input parameters */
+ if ((conf == NULL) ||
+ (conf->tx_burst_sz == 0) ||
+ (conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX) ||
+ (!rte_is_power_of_2(conf->tx_burst_sz))) {
+ RTE_LOG(ERR, PORT, "%s: Invalid input parameters\n", __func__);
+ return NULL;
+ }
+
+ /* Memory allocation */
+ port = rte_zmalloc_socket("PORT", sizeof(*port),
+ RTE_CACHE_LINE_SIZE, socket_id);
+ if (port == NULL) {
+ RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ return NULL;
+ }
+
+ /* Initialization */
+ port->port_id = conf->port_id;
+ port->queue_id = conf->queue_id;
+ port->tx_burst_sz = conf->tx_burst_sz;
+ port->tx_buf_count = 0;
+ port->bsz_mask = 1LLU << (conf->tx_burst_sz - 1);
+
+ /*
+ * When n_retries is 0 it means that we should wait for every packet to
+ * send no matter how many retries should it take. To limit number of
+ * branches in fast path, we use UINT64_MAX instead of branching.
+ */
+ port->n_retries = (conf->n_retries == 0) ? UINT64_MAX : conf->n_retries;
+
+ return port;
+}
+
+static inline void
+send_burst_nodrop(struct rte_port_ethdev_writer_nodrop *p)
+{
+ uint32_t nb_tx = 0, i;
+
+ nb_tx = rte_eth_tx_burst(p->port_id, p->queue_id, p->tx_buf,
+ p->tx_buf_count);
+
+ /* We sent all the packets in a first try */
+ if (nb_tx >= p->tx_buf_count)
+ return;
+
+ for (i = 0; i < p->n_retries; i++) {
+ nb_tx += rte_eth_tx_burst(p->port_id, p->queue_id,
+ p->tx_buf + nb_tx, p->tx_buf_count - nb_tx);
+
+ /* We sent all the packets in more than one try */
+ if (nb_tx >= p->tx_buf_count)
+ return;
+ }
+
+ /* We didn't send the packets in maximum allowed attempts */
+ for ( ; nb_tx < p->tx_buf_count; nb_tx++)
+ rte_pktmbuf_free(p->tx_buf[nb_tx]);
+
+ p->tx_buf_count = 0;
+}
+
+static int
+rte_port_ethdev_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
+{
+ struct rte_port_ethdev_writer_nodrop *p =
+ (struct rte_port_ethdev_writer_nodrop *) port;
+
+ p->tx_buf[p->tx_buf_count++] = pkt;
+ if (p->tx_buf_count >= p->tx_burst_sz)
+ send_burst_nodrop(p);
+
+ return 0;
+}
+
+static int
+rte_port_ethdev_writer_nodrop_tx_bulk(void *port,
+ struct rte_mbuf **pkts,
+ uint64_t pkts_mask)
+{
+ struct rte_port_ethdev_writer_nodrop *p =
+ (struct rte_port_ethdev_writer_nodrop *) 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 (expr == 0) {
+ uint64_t n_pkts = __builtin_popcountll(pkts_mask);
+ uint32_t n_pkts_ok;
+
+ if (tx_buf_count)
+ send_burst_nodrop(p);
+
+ n_pkts_ok = rte_eth_tx_burst(p->port_id, p->queue_id, pkts,
+ n_pkts);
+
+ if (n_pkts_ok >= n_pkts)
+ return 0;
+
+ /*
+ * If we didnt manage to send all packets in single burst, move
+ * remaining packets to the buffer and call send burst.
+ */
+ for (; n_pkts_ok < n_pkts; n_pkts_ok++) {
+ struct rte_mbuf *pkt = pkts[n_pkts_ok];
+ p->tx_buf[p->tx_buf_count++] = pkt;
+ }
+ send_burst_nodrop(p);
+ } else {
+ for ( ; pkts_mask; ) {
+ uint32_t pkt_index = __builtin_ctzll(pkts_mask);
+ uint64_t pkt_mask = 1LLU << pkt_index;
+ struct rte_mbuf *pkt = pkts[pkt_index];
+
+ 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_nodrop(p);
+ }
+
+ return 0;
+}
+
+static int
+rte_port_ethdev_writer_nodrop_flush(void *port)
+{
+ struct rte_port_ethdev_writer_nodrop *p =
+ (struct rte_port_ethdev_writer_nodrop *) port;
+
+ if (p->tx_buf_count > 0)
+ send_burst_nodrop(p);
+
+ return 0;
+}
+
+static int
+rte_port_ethdev_writer_nodrop_free(void *port)
+{
+ if (port == NULL) {
+ RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ return -EINVAL;
+ }
+
+ rte_port_ethdev_writer_nodrop_flush(port);
+ rte_free(port);
+
+ return 0;
+}
+
+/*
* Summary of port operations
*/
struct rte_port_in_ops rte_port_ethdev_reader_ops = {
@@ -256,3 +431,11 @@ struct rte_port_out_ops rte_port_ethdev_writer_ops = {
.f_tx_bulk = rte_port_ethdev_writer_tx_bulk,
.f_flush = rte_port_ethdev_writer_flush,
};
+
+struct rte_port_out_ops rte_port_ethdev_writer_nodrop_ops = {
+ .f_create = rte_port_ethdev_writer_nodrop_create,
+ .f_free = rte_port_ethdev_writer_nodrop_free,
+ .f_tx = rte_port_ethdev_writer_nodrop_tx,
+ .f_tx_bulk = rte_port_ethdev_writer_nodrop_tx_bulk,
+ .f_flush = rte_port_ethdev_writer_nodrop_flush,
+};
diff --git a/lib/librte_port/rte_port_ethdev.h b/lib/librte_port/rte_port_ethdev.h
index af67a12..201a79e 100644
--- a/lib/librte_port/rte_port_ethdev.h
+++ b/lib/librte_port/rte_port_ethdev.h
@@ -79,6 +79,25 @@ struct rte_port_ethdev_writer_params {
/** ethdev_writer port operations */
extern struct rte_port_out_ops rte_port_ethdev_writer_ops;
+/** ethdev_writer_nodrop port parameters */
+struct rte_port_ethdev_writer_nodrop_params {
+ /** NIC RX port ID */
+ uint8_t port_id;
+
+ /** NIC RX queue ID */
+ uint16_t queue_id;
+
+ /** Recommended burst size to NIC TX queue. The actual burst size can be
+ bigger or smaller than this value. */
+ uint32_t tx_burst_sz;
+
+ /** Maximum number of retries, 0 for no limit */
+ uint32_t n_retries;
+};
+
+/** ethdev_writer_nodrop port operations */
+extern struct rte_port_out_ops rte_port_ethdev_writer_nodrop_ops;
+
#ifdef __cplusplus
}
#endif
--
1.7.9.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* [dpdk-dev] [PATCH v3 4/4] port: added ring_writer_nodrop port
2015-05-21 12:28 [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Maciej Gajdzica
` (2 preceding siblings ...)
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 3/4] port: added ethdev_writer_nodrop port Maciej Gajdzica
@ 2015-05-21 12:28 ` Maciej Gajdzica
2015-05-21 16:30 ` [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Dumitrescu, Cristian
4 siblings, 0 replies; 7+ messages in thread
From: Maciej Gajdzica @ 2015-05-21 12:28 UTC (permalink / raw)
To: dev
When ring_writer_nodrop port fails to send data, it tries to resend.
Operation is aborted when maximum number of retries is reached.
Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
lib/librte_port/rte_port_ring.c | 179 +++++++++++++++++++++++++++++++++++++++
lib/librte_port/rte_port_ring.h | 16 ++++
2 files changed, 195 insertions(+)
diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c
index ba1fdcb..89b9641 100644
--- a/lib/librte_port/rte_port_ring.c
+++ b/lib/librte_port/rte_port_ring.c
@@ -31,6 +31,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
+#include <stdint.h>
#include <rte_mbuf.h>
#include <rte_ring.h>
@@ -233,6 +234,176 @@ rte_port_ring_writer_free(void *port)
}
/*
+ * Port RING Writer Nodrop
+ */
+struct rte_port_ring_writer_nodrop {
+ struct rte_mbuf *tx_buf[RTE_PORT_IN_BURST_SIZE_MAX];
+ struct rte_ring *ring;
+ uint32_t tx_burst_sz;
+ uint32_t tx_buf_count;
+ uint64_t bsz_mask;
+ uint64_t n_retries;
+};
+
+static void *
+rte_port_ring_writer_nodrop_create(void *params, int socket_id)
+{
+ struct rte_port_ring_writer_nodrop_params *conf =
+ (struct rte_port_ring_writer_nodrop_params *) params;
+ struct rte_port_ring_writer_nodrop *port;
+
+ /* Check input parameters */
+ if ((conf == NULL) ||
+ (conf->ring == NULL) ||
+ (conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX)) {
+ RTE_LOG(ERR, PORT, "%s: Invalid Parameters\n", __func__);
+ return NULL;
+ }
+
+ /* Memory allocation */
+ port = rte_zmalloc_socket("PORT", sizeof(*port),
+ RTE_CACHE_LINE_SIZE, socket_id);
+ if (port == NULL) {
+ RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__);
+ return NULL;
+ }
+
+ /* Initialization */
+ 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);
+
+ /*
+ * When n_retries is 0 it means that we should wait for every packet to
+ * send no matter how many retries should it take. To limit number of
+ * branches in fast path, we use UINT64_MAX instead of branching.
+ */
+ port->n_retries = (conf->n_retries == 0) ? UINT64_MAX : conf->n_retries;
+
+ return port;
+}
+
+static inline void
+send_burst_nodrop(struct rte_port_ring_writer_nodrop *p)
+{
+ uint32_t nb_tx = 0, i;
+
+ nb_tx = rte_ring_sp_enqueue_burst(p->ring, (void **)p->tx_buf,
+ p->tx_buf_count);
+
+ /* We sent all the packets in a first try */
+ if (nb_tx >= p->tx_buf_count)
+ return;
+
+ for (i = 0; i < p->n_retries; i++) {
+ nb_tx += rte_ring_sp_enqueue_burst(p->ring,
+ (void **) (p->tx_buf + nb_tx), p->tx_buf_count - nb_tx);
+
+ /* We sent all the packets in more than one try */
+ if (nb_tx >= p->tx_buf_count)
+ return;
+ }
+
+ /* We didn't send the packets in maximum allowed attempts */
+ for ( ; nb_tx < p->tx_buf_count; nb_tx++)
+ rte_pktmbuf_free(p->tx_buf[nb_tx]);
+
+ p->tx_buf_count = 0;
+}
+
+static int
+rte_port_ring_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
+{
+ struct rte_port_ring_writer_nodrop *p =
+ (struct rte_port_ring_writer_nodrop *) port;
+
+ p->tx_buf[p->tx_buf_count++] = pkt;
+ if (p->tx_buf_count >= p->tx_burst_sz)
+ send_burst_nodrop(p);
+
+ return 0;
+}
+
+static int
+rte_port_ring_writer_nodrop_tx_bulk(void *port,
+ struct rte_mbuf **pkts,
+ uint64_t pkts_mask)
+{
+ struct rte_port_ring_writer_nodrop *p =
+ (struct rte_port_ring_writer_nodrop *) 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 (expr == 0) {
+ uint64_t n_pkts = __builtin_popcountll(pkts_mask);
+ uint32_t n_pkts_ok;
+
+ if (tx_buf_count)
+ send_burst_nodrop(p);
+
+ n_pkts_ok = rte_ring_sp_enqueue_burst(p->ring, (void **)pkts, n_pkts);
+
+ if (n_pkts_ok >= n_pkts)
+ return 0;
+
+ /*
+ * If we didnt manage to send all packets in single burst, move
+ * remaining packets to the buffer and call send burst.
+ */
+ for (; n_pkts_ok < n_pkts; n_pkts_ok++) {
+ struct rte_mbuf *pkt = pkts[n_pkts_ok];
+ p->tx_buf[p->tx_buf_count++] = pkt;
+ }
+ send_burst_nodrop(p);
+ } else {
+ for ( ; pkts_mask; ) {
+ uint32_t pkt_index = __builtin_ctzll(pkts_mask);
+ uint64_t pkt_mask = 1LLU << pkt_index;
+ struct rte_mbuf *pkt = pkts[pkt_index];
+
+ 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_nodrop(p);
+ }
+
+ return 0;
+}
+
+static int
+rte_port_ring_writer_nodrop_flush(void *port)
+{
+ struct rte_port_ring_writer_nodrop *p =
+ (struct rte_port_ring_writer_nodrop *) port;
+
+ if (p->tx_buf_count > 0)
+ send_burst_nodrop(p);
+
+ return 0;
+}
+
+static int
+rte_port_ring_writer_nodrop_free(void *port)
+{
+ if (port == NULL) {
+ RTE_LOG(ERR, PORT, "%s: Port is NULL\n", __func__);
+ return -EINVAL;
+ }
+
+ rte_port_ring_writer_nodrop_flush(port);
+ rte_free(port);
+
+ return 0;
+}
+
+/*
* Summary of port operations
*/
struct rte_port_in_ops rte_port_ring_reader_ops = {
@@ -248,3 +419,11 @@ struct rte_port_out_ops rte_port_ring_writer_ops = {
.f_tx_bulk = rte_port_ring_writer_tx_bulk,
.f_flush = rte_port_ring_writer_flush,
};
+
+struct rte_port_out_ops rte_port_ring_writer_nodrop_ops = {
+ .f_create = rte_port_ring_writer_nodrop_create,
+ .f_free = rte_port_ring_writer_nodrop_free,
+ .f_tx = rte_port_ring_writer_nodrop_tx,
+ .f_tx_bulk = rte_port_ring_writer_nodrop_tx_bulk,
+ .f_flush = rte_port_ring_writer_nodrop_flush,
+};
diff --git a/lib/librte_port/rte_port_ring.h b/lib/librte_port/rte_port_ring.h
index 009dcf8..89a219b 100644
--- a/lib/librte_port/rte_port_ring.h
+++ b/lib/librte_port/rte_port_ring.h
@@ -75,6 +75,22 @@ struct rte_port_ring_writer_params {
/** ring_writer port operations */
extern struct rte_port_out_ops rte_port_ring_writer_ops;
+/** ring_writer_nodrop port parameters */
+struct rte_port_ring_writer_nodrop_params {
+ /** Underlying single producer ring that has to be pre-initialized */
+ struct rte_ring *ring;
+
+ /** Recommended burst size to ring. The actual burst size can be
+ bigger or smaller than this value. */
+ uint32_t tx_burst_sz;
+
+ /** Maximum number of retries, 0 for no limit */
+ uint32_t n_retries;
+};
+
+/** ring_writer_nodrop port operations */
+extern struct rte_port_out_ops rte_port_ring_writer_nodrop_ops;
+
#ifdef __cplusplus
}
#endif
--
1.7.9.5
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports
2015-05-21 12:28 [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Maciej Gajdzica
` (3 preceding siblings ...)
2015-05-21 12:28 ` [dpdk-dev] [PATCH v3 4/4] port: added ring_writer_nodrop port Maciej Gajdzica
@ 2015-05-21 16:30 ` Dumitrescu, Cristian
2015-06-18 14:42 ` Thomas Monjalon
4 siblings, 1 reply; 7+ messages in thread
From: Dumitrescu, Cristian @ 2015-05-21 16:30 UTC (permalink / raw)
To: Gajdzica, MaciejX T, dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Maciej Gajdzica
> Sent: Thursday, May 21, 2015 1:29 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer
> nodrop ports
>
> When nodrop writer port fails to send data, it retries until reach maximum
> number of retries. Also added new tx_bulk implementation for ring writer
> port.
>
> Changes in v2:
> - added missing signoffs
>
> Changes in v3:
> - removed second implementation of tx_bulk functions
>
> Maciej Gajdzica (4):
> port: removed second implementation of tx_bulk from ethdev_writer
> port
> port: changed tx_bulk implementation if ring_writer port
> port: added ethdev_writer_nodrop port
> port: added ring_writer_nodrop port
>
> lib/librte_port/rte_port_ethdev.c | 206
> +++++++++++++++++++++++++++++------
> lib/librte_port/rte_port_ethdev.h | 19 ++++
> lib/librte_port/rte_port_ring.c | 214
> +++++++++++++++++++++++++++++++++++--
> lib/librte_port/rte_port_ring.h | 16 +++
> 4 files changed, 409 insertions(+), 46 deletions(-)
>
> --
> 1.7.9.5
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports
2015-05-21 16:30 ` [dpdk-dev] [PATCH v3 0/4] port: add ethdev_writer and ring_writer nodrop ports Dumitrescu, Cristian
@ 2015-06-18 14:42 ` Thomas Monjalon
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Monjalon @ 2015-06-18 14:42 UTC (permalink / raw)
To: Gajdzica, MaciejX T; +Cc: dev
> > When nodrop writer port fails to send data, it retries until reach maximum
> > number of retries. Also added new tx_bulk implementation for ring writer
> > port.
> >
> > Changes in v2:
> > - added missing signoffs
> >
> > Changes in v3:
> > - removed second implementation of tx_bulk functions
> >
> > Maciej Gajdzica (4):
> > port: removed second implementation of tx_bulk from ethdev_writer
> > port
> > port: changed tx_bulk implementation if ring_writer port
> > port: added ethdev_writer_nodrop port
> > port: added ring_writer_nodrop port
>
> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Applied, thanks
^ permalink raw reply [flat|nested] 7+ messages in thread