From patchwork Fri Jun 3 00:22:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John Daley (johndale)" X-Patchwork-Id: 13183 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 1A8B6694A; Fri, 3 Jun 2016 02:23:25 +0200 (CEST) Received: from alln-iport-8.cisco.com (alln-iport-8.cisco.com [173.37.142.95]) by dpdk.org (Postfix) with ESMTP id 980E25A76 for ; Fri, 3 Jun 2016 02:23:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=3904; q=dns/txt; s=iport; t=1464913401; x=1466123001; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=oJP+6oylRJYg8EVEOsSg0ATmBkAlr9BNfDoz1Zt8SJE=; b=EhLEytYRj6A1C98i/nm7K9FY4uYnylGoJNBIMlfnk9DNR8+LPjYdx6lg fwXPLuQosi1NGuKKVCsnxxf8GT8ombiHp+CBiaXEiZiPeTqHzZTk3Xvt6 bBZFJSCwj2lWQt+627jCFBtbr8K5a3asD2oNPizf4zO7uPXAt3auuhGAc g=; X-IronPort-AV: E=Sophos;i="5.26,409,1459814400"; d="scan'208";a="280929669" Received: from alln-core-12.cisco.com ([173.36.13.134]) by alln-iport-8.cisco.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 03 Jun 2016 00:23:21 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by alln-core-12.cisco.com (8.14.5/8.14.5) with ESMTP id u530NKKe005653; Fri, 3 Jun 2016 00:23:20 GMT Received: by cisco.com (Postfix, from userid 392789) id ACEB13FAADEC; Thu, 2 Jun 2016 17:23:20 -0700 (PDT) From: John Daley To: dev@dpdk.org Cc: bruce.richarsdon@intel.com, John Daley Date: Thu, 2 Jun 2016 17:22:52 -0700 Message-Id: <1464913377-30879-9-git-send-email-johndale@cisco.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1464913377-30879-1-git-send-email-johndale@cisco.com> References: <1464071579-30072-1-git-send-email-johndale@cisco.com> <1464913377-30879-1-git-send-email-johndale@cisco.com> Subject: [dpdk-dev] [PATCH v3 08/13] enic: refactor Tx mbuf recycling X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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;