From: John Daley <johndale@cisco.com>
To: dev@dpdk.org
Cc: John Daley <johndale@cisco.com>
Subject: [dpdk-dev] [PATCH v2 11/11] enic: add an enic assert macro
Date: Mon, 23 May 2016 23:32:59 -0700 [thread overview]
Message-ID: <1464071579-30072-12-git-send-email-johndale@cisco.com> (raw)
In-Reply-To: <1464071579-30072-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 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
next prev parent reply other threads:[~2016-05-24 6:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 6:32 [dpdk-dev] [PATCH v2 00/11] enic counter fixes and Tx optimization John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 01/11] enic: fix Rx drop counters John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 02/11] enic: drop bad packets and remove unused Rx error flag John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 03/11] enic: count truncated packets John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 04/11] enic: put Tx and Rx functions into same file John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 05/11] enic: remove some unused functions in Tx path John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 06/11] enic: streamline mbuf handling " John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 07/11] enic: use Tx completion messages instead of descriptors John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 08/11] enic: refactor Tx mbuf recycling John Daley
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 09/11] enic: optimize the Tx function John Daley
2016-05-30 10:05 ` Azarewicz, PiotrX T
2016-05-24 6:32 ` [dpdk-dev] [PATCH v2 10/11] enic: remove unused files and functions and variables John Daley
2016-05-24 6:32 ` John Daley [this message]
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 00/13] enic counter fixes and Tx optimization John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 01/13] enic: fix Rx drop counters John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 02/13] enic: drop bad packets and remove unused Rx error flag John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 03/13] enic: count truncated packets John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 04/13] enic: put Tx and Rx functions into same file John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 05/13] enic: remove some unused functions in Tx path John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 06/13] enic: streamline mbuf handling " John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 07/13] enic: use Tx completion messages instead of descriptors John Daley
2016-06-10 21:18 ` Bruce Richardson
2016-06-10 22:28 ` John Daley (johndale)
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 08/13] enic: refactor Tx mbuf recycling John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 09/13] enic: optimize the Tx function John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 10/13] enic: remove unused files and functions and variables John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 11/13] enic: add an enic assert macro John Daley
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 12/13] enic: expand local Tx mbuf flags variable to 64-bits John Daley
2016-06-03 8:05 ` Azarewicz, PiotrX T
2016-06-03 0:22 ` [dpdk-dev] [PATCH v3 13/13] enic: fix Tx IP and UDP/TCP checksum offload John Daley
2016-06-10 22:38 ` [dpdk-dev] [PATCH v3 00/13] enic counter fixes and Tx optimization Bruce Richardson
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=1464071579-30072-12-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).