From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Daley Subject: [PATCH v2 11/11] enic: add an enic assert macro Date: Mon, 23 May 2016 23:32:59 -0700 Message-ID: <1464071579-30072-12-git-send-email-johndale@cisco.com> References: <1464071579-30072-1-git-send-email-johndale@cisco.com> Cc: John Daley To: dev@dpdk.org Return-path: Received: from alln-iport-7.cisco.com (alln-iport-7.cisco.com [173.37.142.94]) by dpdk.org (Postfix) with ESMTP id 928D95A6F for ; Tue, 24 May 2016 08:33:03 +0200 (CEST) In-Reply-To: <1464071579-30072-1-git-send-email-johndale@cisco.com> 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" Add an ASSERT macro for the enic driver which is enabled when the log level is >= RTE_LOG_DEBUG. Assert that number of mbufs to return to the pool in the Tx function is never greater than the max allowed. Signed-off-by: John Daley --- drivers/net/enic/enic.h | 12 ++++++++++++ drivers/net/enic/enic_rxtx.c | 1 + 2 files changed, 13 insertions(+) diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 4eb28ee..4b76e6d 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -187,6 +187,18 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx) return idx; } +#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG +#define ENIC_ASSERT(cond) \ + do { \ + if (unlikely(!(cond))) { \ + rte_panic("line %d\tassert \"" #cond "\"" \ + "failed\n", __LINE__); \ + } \ + } while (0) +#else +#define ENIC_ASSERT(cond) do {} while (0) +#endif + extern void enic_fdir_stats_get(struct enic *enic, struct rte_eth_fdir_stats *stats); extern int enic_fdir_add_fltr(struct enic *enic, diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index a04ebd0..7527bce 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -343,6 +343,7 @@ static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index) buf = &wq->bufs[tail_idx]; m = (struct rte_mbuf *)(buf->mb); if (likely(m->pool == pool)) { + ENIC_ASSERT(nb_free < ENIC_MAX_WQ_DESCS); free[nb_free++] = m; } else { rte_mempool_put_bulk(pool, (void *)free, nb_free); -- 2.7.0