From patchwork Tue Jun 19 21:30:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 41279 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D52581B3A4; Tue, 19 Jun 2018 23:31:29 +0200 (CEST) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 011121B05A for ; Tue, 19 Jun 2018 23:31:08 +0200 (CEST) Received: from nis-sj1-27.broadcom.com (nis-sj1-27.lvn.broadcom.net [10.75.144.136]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id A75E830C110; Tue, 19 Jun 2018 14:31:04 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com A75E830C110 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1529443864; bh=0IxLGtELlBOa3GB8j2vwWDZcFQg6EkRMNUonZlg1ZrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uqePfDoZBzOSi/c7U/aop+kLaIAabwmiuL/8iC5XC4NmDx4ijy1eSqQrxZH+7ynP6 fFqWi/uivajcZCt0vYYXCX+ULF/n/vDnmI64Mvt1Odcj4rKK807pnLvbru8XUMahBu abPljWG8DXSgleeowAqVZ73IhGOA1PJrd/9DS19U= Received: from C02VPB22HTD6.dhcp.broadcom.net (c02vpb22htd6.dhcp.broadcom.net [10.136.50.120]) by nis-sj1-27.broadcom.com (Postfix) with ESMTP id DABEAAC0768; Tue, 19 Jun 2018 14:31:04 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Scott Branden Date: Tue, 19 Jun 2018 14:30:38 -0700 Message-Id: <20180619213058.12273-12-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.15.1 (Apple Git-101) In-Reply-To: <20180619213058.12273-1-ajit.khaparde@broadcom.com> References: <20180619213058.12273-1-ajit.khaparde@broadcom.com> Subject: [dpdk-dev] [PATCH 11/31] net/bnxt: code cleanup style of bnxt rxr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Scott Branden Cleanup alignment, brackets, debug string style of bnxt_rxr Signed-off-by: Scott Branden Reviewed-by: Randy Schacher Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 58 ++++++++++++++++++++++++--------------------- drivers/net/bnxt/bnxt_rxr.h | 6 +++-- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index e4d473f4b..13928c388 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -72,7 +72,6 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq, if (rx_buf == NULL) PMD_DRV_LOG(ERR, "Jumbo Frame. rx_buf is NULL\n"); - rx_buf->mbuf = mbuf; mbuf->data_off = RTE_PKTMBUF_HEADROOM; @@ -82,7 +81,7 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq, } static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr, - struct rte_mbuf *mbuf) + struct rte_mbuf *mbuf) { uint16_t prod = RING_NEXT(rxr->rx_ring_struct, rxr->rx_prod); struct bnxt_sw_rx_bd *prod_rx_buf; @@ -185,7 +184,8 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq, } static int bnxt_agg_bufs_valid(struct bnxt_cp_ring_info *cpr, - uint8_t agg_bufs, uint32_t raw_cp_cons) + uint8_t agg_bufs, + uint32_t raw_cp_cons) { uint16_t last_cp_cons; struct rx_pkt_cmpl *agg_cmpl; @@ -236,8 +236,7 @@ static int bnxt_rx_pages(struct bnxt_rx_queue *rxq, struct rte_mbuf *ag_mbuf; *tmp_raw_cons = NEXT_RAW_CMP(*tmp_raw_cons); cp_cons = RING_CMP(cpr->cp_ring_struct, *tmp_raw_cons); - rxcmp = (struct rx_pkt_cmpl *) - &cpr->cp_desc_ring[cp_cons]; + rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cp_cons]; #ifdef BNXT_DEBUG bnxt_dump_cmpl(cp_cons, rxcmp); @@ -270,11 +269,11 @@ static int bnxt_rx_pages(struct bnxt_rx_queue *rxq, return 0; } -static inline struct rte_mbuf *bnxt_tpa_end( - struct bnxt_rx_queue *rxq, - uint32_t *raw_cp_cons, - struct rx_tpa_end_cmpl *tpa_end, - struct rx_tpa_end_cmpl_hi *tpa_end1 __rte_unused) +static inline +struct rte_mbuf *bnxt_tpa_end(struct bnxt_rx_queue *rxq, + uint32_t *raw_cp_cons, + struct rx_tpa_end_cmpl *tpa_end, + struct rx_tpa_end_cmpl_hi *tpa_end1 __rte_unused) { struct bnxt_cp_ring_info *cpr = rxq->cp_ring; struct bnxt_rx_ring_info *rxr = rxq->rx_ring; @@ -299,6 +298,7 @@ static inline struct rte_mbuf *bnxt_tpa_end( mbuf->l4_len = tpa_end->payload_offset; struct rte_mbuf *new_data = __bnxt_alloc_rx_data(rxq->mb_pool); + RTE_ASSERT(new_data != NULL); if (!new_data) { rte_atomic64_inc(&rxq->rx_mbuf_alloc_fail); @@ -368,7 +368,8 @@ bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1) } static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, - struct bnxt_rx_queue *rxq, uint32_t *raw_cons) + struct bnxt_rx_queue *rxq, + uint32_t *raw_cons) { struct bnxt_cp_ring_info *cpr = rxq->cp_ring; struct bnxt_rx_ring_info *rxr = rxq->rx_ring; @@ -401,14 +402,16 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, cmp_type = CMP_TYPE(rxcmp); if (cmp_type == RX_TPA_START_CMPL_TYPE_RX_TPA_START) { - bnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp, + bnxt_tpa_start(rxq, + (struct rx_tpa_start_cmpl *)rxcmp, (struct rx_tpa_start_cmpl_hi *)rxcmp1); rc = -EINVAL; /* Continue w/o new mbuf */ goto next_rx; } else if (cmp_type == RX_TPA_END_CMPL_TYPE_RX_TPA_END) { - mbuf = bnxt_tpa_end(rxq, &tmp_raw_cons, - (struct rx_tpa_end_cmpl *)rxcmp, - (struct rx_tpa_end_cmpl_hi *)rxcmp1); + mbuf = bnxt_tpa_end(rxq, + &tmp_raw_cons, + (struct rx_tpa_end_cmpl *)rxcmp, + (struct rx_tpa_end_cmpl_hi *)rxcmp1); if (unlikely(!mbuf)) return -EBUSY; *rx_pkt = mbuf; @@ -525,8 +528,9 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, return rc; } -uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, - uint16_t nb_pkts) +uint16_t bnxt_recv_pkts(void *rx_queue, + struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) { struct bnxt_rx_queue *rxq = rx_queue; struct bnxt_cp_ring_info *cpr = rxq->cp_ring; @@ -674,8 +678,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) rxq->rx_ring = rxr; ring = rte_zmalloc_socket("bnxt_rx_ring_struct", - sizeof(struct bnxt_ring), - RTE_CACHE_LINE_SIZE, socket_id); + sizeof(struct bnxt_ring), + RTE_CACHE_LINE_SIZE, socket_id); if (ring == NULL) return -ENOMEM; rxr->rx_ring_struct = ring; @@ -694,8 +698,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) rxq->cp_ring = cpr; ring = rte_zmalloc_socket("bnxt_rx_ring_struct", - sizeof(struct bnxt_ring), - RTE_CACHE_LINE_SIZE, socket_id); + sizeof(struct bnxt_ring), + RTE_CACHE_LINE_SIZE, socket_id); if (ring == NULL) return -ENOMEM; cpr->cp_ring_struct = ring; @@ -709,8 +713,8 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) /* Allocate Aggregator rings */ ring = rte_zmalloc_socket("bnxt_rx_ring_struct", - sizeof(struct bnxt_ring), - RTE_CACHE_LINE_SIZE, socket_id); + sizeof(struct bnxt_ring), + RTE_CACHE_LINE_SIZE, socket_id); if (ring == NULL) return -ENOMEM; rxr->ag_ring_struct = ring; @@ -762,8 +766,8 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) for (i = 0; i < ring->ring_size; i++) { if (bnxt_alloc_rx_data(rxq, rxr, prod) != 0) { PMD_DRV_LOG(WARNING, - "init'ed rx ring %d with %d/%d mbufs only\n", - rxq->queue_id, i, ring->ring_size); + "rx ring %d only has %d/%d mbufs\n", + rxq->queue_id, i, ring->ring_size); break; } rxr->rx_prod = prod; @@ -778,8 +782,8 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq) for (i = 0; i < ring->ring_size; i++) { if (bnxt_alloc_ag_data(rxq, rxr, prod) != 0) { PMD_DRV_LOG(WARNING, - "init'ed AG ring %d with %d/%d mbufs only\n", - rxq->queue_id, i, ring->ring_size); + "AG ring %d only has %d/%d mbufs\n", + rxq->queue_id, i, ring->ring_size); break; } rxr->ag_prod = prod; diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h index 3815a2199..c8ba22ee1 100644 --- a/drivers/net/bnxt/bnxt_rxr.h +++ b/drivers/net/bnxt/bnxt_rxr.h @@ -103,8 +103,10 @@ struct bnxt_rx_ring_info { struct bnxt_tpa_info *tpa_info; }; -uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, - uint16_t nb_pkts); +uint16_t bnxt_recv_pkts(void *rx_queue, + struct rte_mbuf **rx_pkts, + uint16_t nb_pkts); + void bnxt_free_rx_rings(struct bnxt *bp); int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id); int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq);