DPDK patches and discussions
 help / color / mirror / Atom feed
From: John Daley <johndale@cisco.com>
To: dev@dpdk.org
Cc: John Daley <johndale@cisco.com>
Subject: [dpdk-dev] [PATCH 11/11] enic: add ENIC_ASSERT macro
Date: Fri, 20 May 2016 12:04:14 -0700	[thread overview]
Message-ID: <1463771054-16861-11-git-send-email-johndale@cisco.com> (raw)
In-Reply-To: <1463771054-16861-1-git-send-email-johndale@cisco.com>

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 <johndale@cisco.com>
---
 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 821053e..2d522e4 100644
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -349,6 +349,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

      parent reply	other threads:[~2016-05-20 19:05 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-20 19:04 [dpdk-dev] [PATCH 01/11] enic: fix Rx drop counters John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 02/11] enic: drop bad packets, remove unused rx error flag John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 03/11] enic: count truncated packets John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 04/11] enic: Tx cleanup - put Tx and Rx functions into same file John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 05/11] enic: Tx cleanup - remove some unused functions John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 06/11] enic: Tx perf - improve processing of mbufs held by driver John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 07/11] enic: Tx perf - use completion message instead of completion queue John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 08/11] enic: Tx perf - bulk recycle mbufs, refactor John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 09/11] enic: Tx perf - optimize the transmit function John Daley
2016-05-20 19:04 ` [dpdk-dev] [PATCH 10/11] enic: Tx cleanup - remove unused files, functions, variables John Daley
2016-05-20 19:04 ` John Daley [this message]

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=1463771054-16861-11-git-send-email-johndale@cisco.com \
    --to=johndale@cisco.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).