All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Daley <johndale@cisco.com>
To: dev@dpdk.org
Cc: bruce.richarsdon@intel.com, John Daley <johndale@cisco.com>
Subject: [PATCH v3 08/13] enic: refactor Tx mbuf recycling
Date: Thu,  2 Jun 2016 17:22:52 -0700	[thread overview]
Message-ID: <1464913377-30879-9-git-send-email-johndale@cisco.com> (raw)
In-Reply-To: <1464913377-30879-1-git-send-email-johndale@cisco.com>

Mbufs were returned to the pool one at a time. Use rte_mempool_put_bulk
instead. There were muiltiple function calls for each buffer returned.
Refactor this code into just 2 functions.

Signed-off-by: John Daley <johndale@cisco.com>
---
 drivers/net/enic/base/vnic_wq.h | 27 ---------------------
 drivers/net/enic/enic_rxtx.c    | 54 ++++++++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/drivers/net/enic/base/vnic_wq.h b/drivers/net/enic/base/vnic_wq.h
index fe46bb4..689b81c 100644
--- a/drivers/net/enic/base/vnic_wq.h
+++ b/drivers/net/enic/base/vnic_wq.h
@@ -177,33 +177,6 @@ buf_idx_incr(uint32_t n_descriptors, uint32_t idx)
 	return idx;
 }
 
-static inline void vnic_wq_service(struct vnic_wq *wq,
-	struct cq_desc *cq_desc, u16 completed_index,
-	void (*buf_service)(struct vnic_wq *wq,
-	struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque),
-	void *opaque)
-{
-	struct vnic_wq_buf *buf;
-	unsigned int to_clean = wq->tail_idx;
-
-	buf = &wq->bufs[to_clean];
-	while (1) {
-
-		(*buf_service)(wq, cq_desc, buf, opaque);
-
-		wq->ring.desc_avail++;
-
-
-		to_clean = buf_idx_incr(wq->ring.desc_count, to_clean);
-
-		if (to_clean == completed_index)
-			break;
-
-		buf = &wq->bufs[to_clean];
-	}
-	wq->tail_idx = to_clean;
-}
-
 void vnic_wq_free(struct vnic_wq *wq);
 int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
 	unsigned int desc_count, unsigned int desc_size);
diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 2a54333..ec8d90a 100644
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -326,33 +326,49 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 	return nb_rx;
 }
 
-static void enic_wq_free_buf(struct vnic_wq *wq,
-	__rte_unused struct cq_desc *cq_desc,
-	struct vnic_wq_buf *buf,
-	__rte_unused void *opaque)
+static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index)
 {
-	enic_free_wq_buf(wq, buf);
-}
-
-static int enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,
-	__rte_unused u8 type, u16 q_number, u16 completed_index, void *opaque)
-{
-	struct enic *enic = vnic_dev_priv(vdev);
+	struct vnic_wq_buf *buf;
+	struct rte_mbuf *m, *free[ENIC_MAX_WQ_DESCS];
+	unsigned int nb_to_free, nb_free = 0, i;
+	struct rte_mempool *pool;
+	unsigned int tail_idx;
+	unsigned int desc_count = wq->ring.desc_count;
+
+	nb_to_free = enic_ring_sub(desc_count, wq->tail_idx, completed_index)
+				   + 1;
+	tail_idx = wq->tail_idx;
+	buf = &wq->bufs[tail_idx];
+	pool = ((struct rte_mbuf *)buf->mb)->pool;
+	for (i = 0; i < nb_to_free; i++) {
+		buf = &wq->bufs[tail_idx];
+		m = (struct rte_mbuf *)(buf->mb);
+		if (likely(m->pool == pool)) {
+			free[nb_free++] = m;
+		} else {
+			rte_mempool_put_bulk(pool, (void *)free, nb_free);
+			free[0] = m;
+			nb_free = 1;
+			pool = m->pool;
+		}
+		tail_idx = enic_ring_incr(desc_count, tail_idx);
+		buf->mb = NULL;
+	}
 
-	vnic_wq_service(&enic->wq[q_number], cq_desc,
-		completed_index, enic_wq_free_buf,
-		opaque);
+	rte_mempool_put_bulk(pool, (void **)free, nb_free);
 
-	return 0;
+	wq->tail_idx = tail_idx;
+	wq->ring.desc_avail += nb_to_free;
 }
 
-unsigned int enic_cleanup_wq(struct enic *enic, struct vnic_wq *wq)
+unsigned int enic_cleanup_wq(__rte_unused struct enic *enic, struct vnic_wq *wq)
 {
-	u16 completed_index = *((uint32_t *)wq->cqmsg_rz->addr) & 0xffff;
+	u16 completed_index;
+
+	completed_index = *((uint32_t *)wq->cqmsg_rz->addr) & 0xffff;
 
 	if (wq->last_completed_index != completed_index) {
-		enic_wq_service(enic->vdev, NULL, 0, wq->index,
-				completed_index, NULL);
+		enic_free_wq_bufs(wq, completed_index);
 		wq->last_completed_index = completed_index;
 	}
 	return 0;
-- 
2.7.0

  parent reply	other threads:[~2016-06-03  0:23 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-24  6:32 [PATCH v2 00/11] enic counter fixes and Tx optimization John Daley
2016-05-24  6:32 ` [PATCH v2 01/11] enic: fix Rx drop counters John Daley
2016-05-24  6:32 ` [PATCH v2 02/11] enic: drop bad packets and remove unused Rx error flag John Daley
2016-05-24  6:32 ` [PATCH v2 03/11] enic: count truncated packets John Daley
2016-05-24  6:32 ` [PATCH v2 04/11] enic: put Tx and Rx functions into same file John Daley
2016-05-24  6:32 ` [PATCH v2 05/11] enic: remove some unused functions in Tx path John Daley
2016-05-24  6:32 ` [PATCH v2 06/11] enic: streamline mbuf handling " John Daley
2016-05-24  6:32 ` [PATCH v2 07/11] enic: use Tx completion messages instead of descriptors John Daley
2016-05-24  6:32 ` [PATCH v2 08/11] enic: refactor Tx mbuf recycling John Daley
2016-05-24  6:32 ` [PATCH v2 09/11] enic: optimize the Tx function John Daley
2016-05-30 10:05   ` Azarewicz, PiotrX T
2016-05-24  6:32 ` [PATCH v2 10/11] enic: remove unused files and functions and variables John Daley
2016-05-24  6:32 ` [PATCH v2 11/11] enic: add an enic assert macro John Daley
2016-06-03  0:22 ` [PATCH v3 00/13] enic counter fixes and Tx optimization John Daley
2016-06-03  0:22   ` [PATCH v3 01/13] enic: fix Rx drop counters John Daley
2016-06-03  0:22   ` [PATCH v3 02/13] enic: drop bad packets and remove unused Rx error flag John Daley
2016-06-03  0:22   ` [PATCH v3 03/13] enic: count truncated packets John Daley
2016-06-03  0:22   ` [PATCH v3 04/13] enic: put Tx and Rx functions into same file John Daley
2016-06-03  0:22   ` [PATCH v3 05/13] enic: remove some unused functions in Tx path John Daley
2016-06-03  0:22   ` [PATCH v3 06/13] enic: streamline mbuf handling " John Daley
2016-06-03  0:22   ` [PATCH v3 07/13] enic: use Tx completion messages instead of descriptors John Daley
2016-06-10 21:18     ` Bruce Richardson
2016-06-10 22:28       ` John Daley (johndale)
2016-06-03  0:22   ` John Daley [this message]
2016-06-03  0:22   ` [PATCH v3 09/13] enic: optimize the Tx function John Daley
2016-06-03  0:22   ` [PATCH v3 10/13] enic: remove unused files and functions and variables John Daley
2016-06-03  0:22   ` [PATCH v3 11/13] enic: add an enic assert macro John Daley
2016-06-03  0:22   ` [PATCH v3 12/13] enic: expand local Tx mbuf flags variable to 64-bits John Daley
2016-06-03  8:05     ` Azarewicz, PiotrX T
2016-06-03  0:22   ` [PATCH v3 13/13] enic: fix Tx IP and UDP/TCP checksum offload John Daley
2016-06-10 22:38   ` [PATCH v3 00/13] enic counter fixes and Tx optimization Bruce Richardson

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=1464913377-30879-9-git-send-email-johndale@cisco.com \
    --to=johndale@cisco.com \
    --cc=bruce.richarsdon@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.