DPDK patches and discussions
 help / color / mirror / Atom feed
From: Arnon Warshavsky <arnon@qwilt.com>
To: thomas@monjalon.net, anatoly.burakov@intel.com,
	wenzhuo.lu@intel.com, declan.doherty@intel.com,
	jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com,
	ferruh.yigit@intel.com
Cc: dev@dpdk.org, arnon@qwilt.com
Subject: [dpdk-dev] [PATCH v7 06/11] kni: replace rte_panic instances in kni
Date: Wed, 25 Apr 2018 01:16:48 +0300	[thread overview]
Message-ID: <1524608213-2080-7-git-send-email-arnon@qwilt.com> (raw)
In-Reply-To: <1524608213-2080-1-git-send-email-arnon@qwilt.com>

replace panic calls with log and return value.
Local function to this file,
changing from void to int is non-abi-breaking

Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
---
 lib/librte_kni/rte_kni.c      | 18 ++++++++++++------
 lib/librte_kni/rte_kni_fifo.h | 11 ++++++++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 8a8f6c1..4dac407 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -353,37 +353,43 @@ struct rte_kni *
 	/* TX RING */
 	mz = slot->m_tx_q;
 	ctx->tx_q = mz->addr;
-	kni_fifo_init(ctx->tx_q, KNI_FIFO_COUNT_MAX);
+	if (kni_fifo_init(ctx->tx_q, KNI_FIFO_COUNT_MAX))
+		return NULL;
 	dev_info.tx_phys = mz->phys_addr;
 
 	/* RX RING */
 	mz = slot->m_rx_q;
 	ctx->rx_q = mz->addr;
-	kni_fifo_init(ctx->rx_q, KNI_FIFO_COUNT_MAX);
+	if (kni_fifo_init(ctx->rx_q, KNI_FIFO_COUNT_MAX))
+		return NULL;
 	dev_info.rx_phys = mz->phys_addr;
 
 	/* ALLOC RING */
 	mz = slot->m_alloc_q;
 	ctx->alloc_q = mz->addr;
-	kni_fifo_init(ctx->alloc_q, KNI_FIFO_COUNT_MAX);
+	if (kni_fifo_init(ctx->alloc_q, KNI_FIFO_COUNT_MAX))
+		return NULL;
 	dev_info.alloc_phys = mz->phys_addr;
 
 	/* FREE RING */
 	mz = slot->m_free_q;
 	ctx->free_q = mz->addr;
-	kni_fifo_init(ctx->free_q, KNI_FIFO_COUNT_MAX);
+	if (kni_fifo_init(ctx->free_q, KNI_FIFO_COUNT_MAX))
+		return NULL;
 	dev_info.free_phys = mz->phys_addr;
 
 	/* Request RING */
 	mz = slot->m_req_q;
 	ctx->req_q = mz->addr;
-	kni_fifo_init(ctx->req_q, KNI_FIFO_COUNT_MAX);
+	if (kni_fifo_init(ctx->req_q, KNI_FIFO_COUNT_MAX))
+		return NULL;
 	dev_info.req_phys = mz->phys_addr;
 
 	/* Response RING */
 	mz = slot->m_resp_q;
 	ctx->resp_q = mz->addr;
-	kni_fifo_init(ctx->resp_q, KNI_FIFO_COUNT_MAX);
+	if (kni_fifo_init(ctx->resp_q, KNI_FIFO_COUNT_MAX))
+		return NULL;
 	dev_info.resp_phys = mz->phys_addr;
 
 	/* Req/Resp sync mem area */
diff --git a/lib/librte_kni/rte_kni_fifo.h b/lib/librte_kni/rte_kni_fifo.h
index ac26a8c..5052015 100644
--- a/lib/librte_kni/rte_kni_fifo.h
+++ b/lib/librte_kni/rte_kni_fifo.h
@@ -7,17 +7,22 @@
 /**
  * Initializes the kni fifo structure
  */
-static void
+static int
 kni_fifo_init(struct rte_kni_fifo *fifo, unsigned size)
 {
 	/* Ensure size is power of 2 */
-	if (size & (size - 1))
-		rte_panic("KNI fifo size must be power of 2\n");
+	if (size & (size - 1)) {
+		RTE_LOG(CRIT, EAL, "%s(): KNI fifo size must be power of 2\n",
+				__func__);
+		return -1;
+	}
 
 	fifo->write = 0;
 	fifo->read = 0;
 	fifo->len = size;
 	fifo->elem_size = sizeof(void *);
+
+	return 0;
 }
 
 /**
-- 
1.8.3.1

  parent reply	other threads:[~2018-04-24 22:17 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-24 22:16 [dpdk-dev] [PATCH v7 00/11] eal: replace calls to rte_panic and refrain from new instances Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 01/11] crypto/dpaa: replace rte_panic instances in crypto/dpaa driver Arnon Warshavsky
2018-04-26 16:05   ` Kevin Traynor
2018-04-26 16:16     ` Kevin Traynor
2018-04-26 21:28     ` Arnon Warshavsky
2018-04-27 10:08       ` Kevin Traynor
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 02/11] bond: replace rte_panic instances in bonding driver Arnon Warshavsky
2018-04-24 22:51   ` Stephen Hemminger
2018-04-25  9:38     ` Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 03/11] e1000: replace rte_panic instances in e1000 driver Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 04/11] ixgbe: replace rte_panic instances in ixgbe driver Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 05/11] eal: replace rte_panic instances in eventdev Arnon Warshavsky
2018-04-24 22:16 ` Arnon Warshavsky [this message]
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 07/11] eal: replace rte_panic instances in hugepage_info Arnon Warshavsky
2018-04-25  8:58   ` Burakov, Anatoly
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 08/11] eal: replace rte_panic instances in interrupts thread Arnon Warshavsky
2018-04-25  9:14   ` Burakov, Anatoly
2018-04-25  9:37     ` Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 09/11] eal: replace rte_panic instances in ethdev Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 10/11] eal: replace rte_panic instances in init sequence Arnon Warshavsky
2018-04-25  9:07   ` Burakov, Anatoly
2018-04-25  9:33     ` Arnon Warshavsky
2018-04-24 22:16 ` [dpdk-dev] [PATCH v7 11/11] devtools: prevent new instances of rte_panic and rte_exit Arnon Warshavsky
2018-04-24 22:52   ` Stephen Hemminger
2018-04-24 23:03     ` Thomas Monjalon
2018-04-24 23:15       ` Stephen Hemminger
2018-04-25 13:45 ` [dpdk-dev] [PATCH v8 00/10] eal: replace calls to rte_panic and refrain from new instances Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 01/10] crypto/dpaa: replace rte_panic instances in crypto/dpaa driver Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 02/10] bond: replace rte_panic instances in bonding driver Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 03/10] e1000: replace rte_panic instances in e1000 driver Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 04/10] ixgbe: replace rte_panic instances in ixgbe driver Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 05/10] eal: replace rte_panic instances in eventdev Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 06/10] kni: replace rte_panic instances in kni Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 07/10] eal: replace rte_panic instances in hugepage_info Arnon Warshavsky
2018-04-25 13:50     ` Burakov, Anatoly
2018-04-25 14:02       ` Arnon Warshavsky
2018-04-25 14:14         ` Burakov, Anatoly
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 08/10] eal: replace rte_panic instances in ethdev Arnon Warshavsky
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 09/10] eal: replace rte_panic instances in init sequence Arnon Warshavsky
2018-04-25 13:53     ` Burakov, Anatoly
2018-04-25 13:45   ` [dpdk-dev] [PATCH v8 10/10] devtools: prevent new instances of rte_panic and rte_exit Arnon Warshavsky
2018-04-26  6:20     ` [dpdk-dev] [PATCH v9 00/10] eal: replace calls to rte_panic and refrain from new instances Arnon Warshavsky
2018-04-26  6:20       ` [dpdk-dev] [PATCH v9 01/10] crypto/dpaa: replace rte_panic instances in crypto/dpaa driver Arnon Warshavsky
2018-04-26  6:20       ` [dpdk-dev] [PATCH v9 02/10] bond: replace rte_panic instances in bonding driver Arnon Warshavsky
2018-04-26 16:06         ` Kevin Traynor
2018-04-26 21:06           ` Arnon Warshavsky
2018-04-26 21:26             ` Thomas Monjalon
2018-04-26  6:20       ` [dpdk-dev] [PATCH v9 03/10] e1000: replace rte_panic instances in e1000 driver Arnon Warshavsky
2018-04-26  6:20       ` [dpdk-dev] [PATCH v9 04/10] ixgbe: replace rte_panic instances in ixgbe driver Arnon Warshavsky
2018-04-26  6:20       ` [dpdk-dev] [PATCH v9 05/10] eal: replace rte_panic instances in eventdev Arnon Warshavsky
2018-04-26  6:21       ` [dpdk-dev] [PATCH v9 06/10] kni: replace rte_panic instances in kni Arnon Warshavsky
2018-04-26  6:21       ` [dpdk-dev] [PATCH v9 07/10] eal: replace rte_panic instances in hugepage_info Arnon Warshavsky
2018-04-26  6:21       ` [dpdk-dev] [PATCH v9 08/10] eal: replace rte_panic instances in ethdev Arnon Warshavsky
2018-04-26 16:07         ` Kevin Traynor
2018-04-26 21:38           ` Arnon Warshavsky
2018-04-26  6:21       ` [dpdk-dev] [PATCH v9 09/10] eal: replace rte_panic instances in init sequence Arnon Warshavsky
2018-04-26 16:07         ` Kevin Traynor
2018-04-26 22:08           ` Arnon Warshavsky
2018-04-26 22:27             ` Arnon Warshavsky
2018-04-27  9:56             ` Kevin Traynor
2018-04-26  6:21       ` [dpdk-dev] [PATCH v9 10/10] devtools: prevent new instances of rte_panic and rte_exit Arnon Warshavsky
2018-04-26 16:08         ` Kevin Traynor
2018-04-26 21:57           ` Arnon Warshavsky
2018-04-27 10:02             ` Kevin Traynor
2018-04-29  6:23               ` Arnon Warshavsky
2018-04-30  6:45         ` [dpdk-dev] [PATCH v10] devtools: alert on " Arnon Warshavsky
2018-05-04 16:42           ` Kevin Traynor
2018-05-27 19:47           ` Thomas Monjalon
2018-05-27 20:34             ` Arnon Warshavsky
2018-07-15 23:15               ` Thomas Monjalon
2018-07-16 11:37           ` [dpdk-dev] [PATCH v11] " Arnon Warshavsky
2018-07-16 12:44             ` [dpdk-dev] [PATCH v12] " Arnon Warshavsky
2018-07-26 20:29               ` Thomas Monjalon
2018-07-26 20:57                 ` Arnon Warshavsky
2018-07-26 21:00                   ` Thomas Monjalon
2018-07-26 21:42                 ` Arnon Warshavsky
2018-07-26 21:56                 ` Thomas Monjalon
2018-07-26 22:00                   ` Arnon Warshavsky
2018-07-26 22:10               ` [dpdk-dev] [PATCH v13] " Arnon Warshavsky
2018-07-31 12:11                 ` Thomas Monjalon
2018-07-31 12:32                   ` Arnon Warshavsky
2018-07-31 12:38                 ` Thomas Monjalon
2018-09-10  6:06                   ` David Marchand
2018-09-10  6:17                     ` Arnon Warshavsky
2018-09-10  6:24                       ` David Marchand
2018-04-27 14:22       ` [dpdk-dev] [PATCH v9 00/10] eal: replace calls to rte_panic and refrain from new instances Thomas Monjalon
2018-04-27 16:31         ` Arnon Warshavsky
2018-04-27 16:40           ` Thomas Monjalon
2018-04-27 17:16             ` Arnon Warshavsky
2018-04-27 14:30       ` Thomas Monjalon
2018-04-25 15:59   ` [dpdk-dev] [PATCH v8 " Stephen Hemminger

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=1524608213-2080-7-git-send-email-arnon@qwilt.com \
    --to=arnon@qwilt.com \
    --cc=anatoly.burakov@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=declan.doherty@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=jerin.jacob@caviumnetworks.com \
    --cc=thomas@monjalon.net \
    --cc=wenzhuo.lu@intel.com \
    /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).