From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnon Warshavsky Subject: [PATCH v4 01/11] crypto: replace rte_panic instances in crypto driver Date: Thu, 19 Apr 2018 09:00:59 +0300 Message-ID: <1524117669-25729-2-git-send-email-arnon@qwilt.com> References: <1524117669-25729-1-git-send-email-arnon@qwilt.com> Cc: dev@dpdk.org, 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 Return-path: Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id 78D9C5F36 for ; Thu, 19 Apr 2018 08:01:21 +0200 (CEST) In-Reply-To: <1524117669-25729-1-git-send-email-arnon@qwilt.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" replace panic calls with log and return value. -- v2: - reformat error message to include literal string in a single line v4: replace -1 return value with -ENOMEM Signed-off-by: Arnon Warshavsky --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 +++++--- drivers/crypto/dpaa_sec/dpaa_sec.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 23012e3..d465a2d 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -2861,9 +2861,11 @@ struct rte_security_ops dpaa2_sec_security_ops = { RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (cryptodev->data->dev_private == NULL) { + RTE_LOG(ERR, PMD, "%s() Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } dpaa2_dev->cryptodev = cryptodev; diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index b685220..7b63650 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2356,9 +2356,11 @@ struct rte_security_ops dpaa_sec_security_ops = { RTE_CACHE_LINE_SIZE, rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); + if (cryptodev->data->dev_private == NULL) { + RTE_LOG(ERR, PMD, "%s() Cannot allocate memzone for private device data", + __func__); + return -ENOMEM; + } } dpaa_dev->crypto_dev = cryptodev; -- 1.8.3.1