From 1a4b563fa810fd08e5e8c51117270402c10d1d88 Mon Sep 17 00:00:00 2001 From: John Daley Date: Thu, 2 Jun 2016 17:22:55 -0700 Subject: [PATCH] net/enic: add an assert macro 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 4eb28eea48..4b76e6d4f4 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 98d93bb40f..b9713252af 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.20.1