From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1B57BA034F
for <public@inbox.dpdk.org>; Thu, 25 Feb 2021 19:23:59 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 91675406B4;
Thu, 25 Feb 2021 19:23:55 +0100 (CET)
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26]) by mails.dpdk.org (Postfix) with ESMTP id DFFE1406B4;
Thu, 25 Feb 2021 19:23:54 +0100 (CET)
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailout.nyi.internal (Postfix) with ESMTP id 726B85C00AF;
Thu, 25 Feb 2021 13:23:54 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
by compute2.internal (MEProxy); Thu, 25 Feb 2021 13:23:54 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=fm3; bh=IR1dKuuMKcYmm
GI8peHQqf42UQkAyb1clGQvXz1wfGk=; b=GGUonh4KawJiquhDoXxUFFWbDYCCI
nUrOxUUn/eBAWGUzudJTaj6xYL+0DDA1R08BS/dqv5XbEvazMJGJvotMsj5Op8vS
btn0DdJffS9JIlvwQb31BGF3MUGEXBH5pmaK+mrLdvnYHNH6qS2GacDe7ffrisDb
dKJ+G8r58GlCqsoqZNrjTCRWB5mqifLSNFZiBpjXZxRK6qS8mMwzLrAnFqdW213D
AU06W7Ylb0mabetTIIFfZwD2vm0q6UhFv7D/1pSrEo9XLSJKBgbRMXmb4RN93Kka
K0mMHOMdwuXgep3eHTOHyop30Cw+FIzy+y+1+eZsceeaRgrQZKgXxNzAg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm2; bh=IR1dKuuMKcYmmGI8peHQqf42UQkAyb1clGQvXz1wfGk=; b=CLR7A25L
A+EKzQMTMDtSRF/EKMThlswOAm8RJ9I+7ejcE0MqusD7IUyfns8h8MPh07+oz9jE
aV3eLSCocsQ6iZEW1GPuaApwjobLNttia+Jr9J+eMgzf7eKspHzpMgKjLQPuFrC+
2EB8jOKYPs1NKz87aeZTm0jiJ/bejR2fbcWEPBkZ5jkd0f43wkCgx8TyR9rVhUtt
zUG1MuFnfPXSqP8Yy+B4N79wUOdscEP5QflVszGZAwPcXf+eUL4dJ+eMpTIUh7br
LGoximGxFruZop2wrNyveUCIuev1g2PtG39yt00F8GpQMZ5J+rLIPpyRGPAIHwQK
p8Xady2mcOZZKg==
X-ME-Sender: <xms:Ous3YEQaQSOLs0R5uvEaupBHtCxWmnO5nz2OG_qgnyqVS-jfv41jNw>
<xme:Ous3YDH40kyJ8bsMRaa7pZ79l10_xZdtYJiDy12qNUA0k-GtQrVtbEXkx-tovz3Cg
5y21CjWoTmZnGUG-w>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeelgdduudegucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr
shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg
ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg
uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf
hiiigvpeejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl
ohhnrdhnvght
X-ME-Proxy: <xmx:Ous3YGe3Kic6Cb7bd7MxQpB5AwBgACf4SsRvRU-L-XdwKbP_1OktnQ>
<xmx:Ous3YKtIph1-mzhU0I5eAExCXs7GUN6XmsO9yywGtCRcBMEUtkVfYw>
<xmx:Ous3YEcw4JIUoO-MJBtjrQDxs7IDpU6IfbBIM7dx45mfwdCVpJ97aQ>
<xmx:Ous3YFQc8KqerjnRR6Y8nqH_UgkXTcgAo9xaJbnp-JgGraAQq8mmqg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 88162240067;
Thu, 25 Feb 2021 13:23:53 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: ncopa@alpinelinux.org, stable@dpdk.org,
Hemant Agrawal <hemant.agrawal@nxp.com>,
Sachin Saxena <sachin.saxena@oss.nxp.com>,
Shreyansh Jain <shreyansh.jain@nxp.com>, Roy Pledge <roy.pledge@nxp.com>,
Geoff Thorpe <geoff.thorpe@nxp.com>
Date: Thu, 25 Feb 2021 19:22:43 +0100
Message-Id: <20210225182250.1149592-11-thomas@monjalon.net>
X-Mailer: git-send-email 2.30.1
In-Reply-To: <20210225182250.1149592-1-thomas@monjalon.net>
References: <20190313170657.16688-1-ncopa@alpinelinux.org>
<20210225182250.1149592-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] [PATCH v5 10/17] bus/dpaa: fix build with musl
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
From: Natanael Copa <ncopa@alpinelinux.org>
Fix build with musl libc by using warn(3) instead of using the GNU
specific error(3).
`error(0, errno, ...)` is identical to `warn(...)` so replace:
error(0, ret, ...);
with the identical:
errno = ret;
warn(...);
We could have used the identical `warnx("...: %s", strerror(ret))` but
strerror(3) is not thread-safe and the strerror_r variant has two
incompatible versions, one GNU specific and one XSI-compliant. Avoid the
mess by letting `warn` use the thread-local errno.
This also fixes error message for kzmalloc failures which previously
would always have given "Unknown error -1", since that is what
strerror(-1) returns. Let 'warn' use the proper error message from errno
which is set by kzalloc.
Fixes: 9d32ef0f5d61 ("bus/dpaa: support creating dynamic HW portal")
Fixes: f09ede6c8fd1 ("bus/dpaa: add BMAN driver core")
Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")
Cc: stable@dpdk.org
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
drivers/bus/dpaa/base/fman/netcfg_layer.c | 4 ++--
drivers/bus/dpaa/base/qbman/bman_driver.c | 13 +++++++++----
drivers/bus/dpaa/base/qbman/qman_driver.c | 17 ++++++++++++-----
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index b7009f2299..bcedbaf68f 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -8,7 +8,7 @@
#include <dpaa_of.h>
#include <net/if.h>
#include <sys/ioctl.h>
-#include <error.h>
+#include <err.h>
#include <net/if_arp.h>
#include <assert.h>
#include <unistd.h>
@@ -90,7 +90,7 @@ netcfg_acquire(void)
*/
skfd = socket(AF_PACKET, SOCK_RAW, 0);
if (unlikely(skfd < 0)) {
- error(0, errno, "%s(): open(SOCK_RAW)", __func__);
+ warn("%s(): open(SOCK_RAW)", __func__);
return NULL;
}
diff --git a/drivers/bus/dpaa/base/qbman/bman_driver.c b/drivers/bus/dpaa/base/qbman/bman_driver.c
index 750b756b93..c0b9e3da77 100644
--- a/drivers/bus/dpaa/base/qbman/bman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/bman_driver.c
@@ -11,6 +11,7 @@
#include <process.h>
#include "bman_priv.h"
#include <sys/ioctl.h>
+#include <err.h>
/*
* Global variables of the max portal/pool number this bman version supported
@@ -40,7 +41,8 @@ static int fsl_bman_portal_init(uint32_t idx, int is_shared)
ret = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t),
&cpuset);
if (ret) {
- error(0, ret, "pthread_getaffinity_np()");
+ errno = ret;
+ warn("pthread_getaffinity_np()");
return ret;
}
pcfg.cpu = -1;
@@ -60,7 +62,8 @@ static int fsl_bman_portal_init(uint32_t idx, int is_shared)
map.index = idx;
ret = process_portal_map(&map);
if (ret) {
- error(0, ret, "process_portal_map()");
+ errno = ret;
+ warn("process_portal_map()");
return ret;
}
/* Make the portal's cache-[enabled|inhibited] regions */
@@ -104,8 +107,10 @@ static int fsl_bman_portal_finish(void)
cfg = bman_destroy_affine_portal();
DPAA_BUG_ON(cfg != &pcfg);
ret = process_portal_unmap(&map.addr);
- if (ret)
- error(0, ret, "process_portal_unmap()");
+ if (ret) {
+ errno = ret;
+ warn("process_portal_unmap()");
+ }
return ret;
}
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 6d9aaff164..93375d1ea8 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -9,6 +9,8 @@
#include <process.h>
#include "qman_priv.h"
#include <sys/ioctl.h>
+#include <err.h>
+
#include <rte_branch_prediction.h>
/* Global variable containing revision id (even on non-control plane systems
@@ -50,7 +52,8 @@ static int fsl_qman_portal_init(uint32_t index, int is_shared)
map.index = index;
ret = process_portal_map(&map);
if (ret) {
- error(0, ret, "process_portal_map()");
+ errno = ret;
+ warn("process_portal_map()");
return ret;
}
qpcfg.channel = map.channel;
@@ -96,8 +99,10 @@ static int fsl_qman_portal_finish(void)
cfg = qman_destroy_affine_portal(NULL);
DPAA_BUG_ON(cfg != &qpcfg);
ret = process_portal_unmap(&map.addr);
- if (ret)
- error(0, ret, "process_portal_unmap()");
+ if (ret) {
+ errno = ret;
+ warn("process_portal_unmap()");
+ }
return ret;
}
@@ -146,7 +151,8 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
q_pcfg = kzalloc((sizeof(struct qm_portal_config)), 0);
if (!q_pcfg) {
- error(0, -1, "q_pcfg kzalloc failed");
+ /* kzalloc sets errno */
+ warn("q_pcfg kzalloc failed");
return NULL;
}
@@ -155,7 +161,8 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
q_map.index = QBMAN_ANY_PORTAL_IDX;
ret = process_portal_map(&q_map);
if (ret) {
- error(0, ret, "process_portal_map()");
+ errno = ret;
+ warn("process_portal_map()");
kfree(q_pcfg);
return NULL;
}
--
2.30.1