From 5058a6e3f9af5f8841466e367ecfb9d8aa93a6e0 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 19 Jun 2014 22:12:35 +0100 Subject: [PATCH] distributor: split get_pkt into request and poll Take the existing get_pkt API and split out the parts for requesting a new packet from the part to poll for arrival of a new packet. These individual functions can then be used independently of the get function, which still acts as before. The split functions for request and poll will allow a worker to pull packets from multiple distributors, or to act as multiple workers with a single distributor if needed for better performance. Signed-off-by: Bruce Richardson Acked-by: Pablo de Lara --- lib/librte_distributor/rte_distributor.c | 27 ++++++++++++--- lib/librte_distributor/rte_distributor.h | 44 +++++++++++++++++++++++- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 5eee4429f0..ec6094f705 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -103,8 +103,8 @@ TAILQ_HEAD(rte_distributor_list, rte_distributor); /**** APIs called by workers ****/ -struct rte_mbuf * -rte_distributor_get_pkt(struct rte_distributor *d, +void +rte_distributor_request_pkt(struct rte_distributor *d, unsigned worker_id, struct rte_mbuf *oldpkt) { union rte_distributor_buffer *buf = &d->bufs[worker_id]; @@ -113,13 +113,32 @@ rte_distributor_get_pkt(struct rte_distributor *d, while (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK)) rte_pause(); buf->bufptr64 = req; - while (buf->bufptr64 & RTE_DISTRIB_GET_BUF) - rte_pause(); +} + +struct rte_mbuf * +rte_distributor_poll_pkt(struct rte_distributor *d, + unsigned worker_id) +{ + union rte_distributor_buffer *buf = &d->bufs[worker_id]; + if (buf->bufptr64 & RTE_DISTRIB_GET_BUF) + return NULL; + /* since bufptr64 is signed, this should be an arithmetic shift */ int64_t ret = buf->bufptr64 >> RTE_DISTRIB_FLAG_BITS; return (struct rte_mbuf *)((uintptr_t)ret); } +struct rte_mbuf * +rte_distributor_get_pkt(struct rte_distributor *d, + unsigned worker_id, struct rte_mbuf *oldpkt) +{ + struct rte_mbuf *ret; + rte_distributor_request_pkt(d, worker_id, oldpkt); + while ((ret = rte_distributor_poll_pkt(d, worker_id)) == NULL) + rte_pause(); + return ret; +} + int rte_distributor_return_pkt(struct rte_distributor *d, unsigned worker_id, struct rte_mbuf *oldpkt) diff --git a/lib/librte_distributor/rte_distributor.h b/lib/librte_distributor/rte_distributor.h index 1e41dce8cd..ec0d74ada0 100644 --- a/lib/librte_distributor/rte_distributor.h +++ b/lib/librte_distributor/rte_distributor.h @@ -193,7 +193,49 @@ int rte_distributor_return_pkt(struct rte_distributor *d, unsigned worker_id, struct rte_mbuf *mbuf); -/******************************************/ +/** + * API called by a worker to request a new packet to process. + * Any previous packet given to the worker is assumed to have completed + * processing, and may be optionally returned to the distributor via + * the oldpkt parameter. + * Unlike rte_distributor_get_pkt(), this function does not wait for a new + * packet to be provided by the distributor. + * + * NOTE: after calling this function, rte_distributor_poll_pkt() should + * be used to poll for the packet requested. The rte_distributor_get_pkt() + * API should *not* be used to try and retrieve the new packet. + * + * @param d + * The distributor instance to be used + * @param worker_id + * The worker instance number to use - must be less that num_workers passed + * at distributor creation time. + * @param oldpkt + * The previous packet, if any, being processed by the worker + */ +void +rte_distributor_request_pkt(struct rte_distributor *d, + unsigned worker_id, struct rte_mbuf *oldpkt); + +/** + * API called by a worker to check for a new packet that was previously + * requested by a call to rte_distributor_request_pkt(). It does not wait + * for the new packet to be available, but returns NULL if the request has + * not yet been fulfilled by the distributor. + * + * @param d + * The distributor instance to be used + * @param worker_id + * The worker instance number to use - must be less that num_workers passed + * at distributor creation time. + * + * @return + * A new packet to be processed by the worker thread, or NULL if no + * packet is yet available. + */ +struct rte_mbuf * +rte_distributor_poll_pkt(struct rte_distributor *d, + unsigned worker_id); #ifdef __cplusplus } -- 2.20.1