From patchwork Fri Jun 3 00:22:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John Daley (johndale)" X-Patchwork-Id: 13186 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 977006A66; Fri, 3 Jun 2016 02:23:27 +0200 (CEST) Received: from rcdn-iport-9.cisco.com (rcdn-iport-9.cisco.com [173.37.86.80]) by dpdk.org (Postfix) with ESMTP id C9FDC6944 for ; Fri, 3 Jun 2016 02:23:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1614; q=dns/txt; s=iport; t=1464913403; x=1466123003; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=lA6URNi/upoO8mPOS+2j9Ma33q4lNTa88a0V3AttGgw=; b=klxAC7zgv7afy8ZDXHRe96eV480SSmK9jSiVCiZi8ldBfzowxU0Dzz5v GVcqMQP4KsY8EtGVFGTN9HY6aHnaWxaDYnX0P57hKAxKQlqoMExC9vGXB /3nFg2P4+Zqvg87y134r8a74tjqkw5oCSxLX5azPv92a6ziep2HdrCtCR Y=; X-IronPort-AV: E=Sophos;i="5.26,409,1459814400"; d="scan'208";a="108908228" Received: from alln-core-7.cisco.com ([173.36.13.140]) by rcdn-iport-9.cisco.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 03 Jun 2016 00:23:22 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by alln-core-7.cisco.com (8.14.5/8.14.5) with ESMTP id u530NMUT014122; Fri, 3 Jun 2016 00:23:23 GMT Received: by cisco.com (Postfix, from userid 392789) id C6F9B3FAADEC; Thu, 2 Jun 2016 17:23:22 -0700 (PDT) From: John Daley To: dev@dpdk.org Cc: bruce.richarsdon@intel.com, John Daley Date: Thu, 2 Jun 2016 17:22:55 -0700 Message-Id: <1464913377-30879-12-git-send-email-johndale@cisco.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1464913377-30879-1-git-send-email-johndale@cisco.com> References: <1464071579-30072-1-git-send-email-johndale@cisco.com> <1464913377-30879-1-git-send-email-johndale@cisco.com> Subject: [dpdk-dev] [PATCH v3 11/13] enic: add an enic assert macro X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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);