From: Shreyansh Jain <shreyansh.jain@nxp.com>
To: <thomas@monjalon.net>
Cc: <dev@dpdk.org>, <ferruh.yigit@intel.com>,
<hemant.agrawal@nxp.com>, Shreyansh Jain <shreyansh.jain@nxp.com>,
<santosh.shukla@caviumnetworks.com>
Subject: [dpdk-dev] [PATCH v2] bus/dpaa: fix memory allocation during bus scan
Date: Tue, 10 Oct 2017 15:04:58 +0530 [thread overview]
Message-ID: <20171010093458.19861-1-shreyansh.jain@nxp.com> (raw)
In-Reply-To: <20171010070155.17412-1-shreyansh.jain@nxp.com>
With the IOVA auto detection changes, bus scan is performed before
memory initialization. DPAA bus scan must not use rte_malloc in
its path.
Fixes: cf408c22476c ("eal: auto detect IOVA mode")
Cc: santosh.shukla@caviumnetworks.com
Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
v2:
Changed the Fixes line to correct commit
Correct position of fixes line
drivers/bus/dpaa/base/fman/fman.c | 15 ++++++++-------
drivers/net/dpaa/dpaa_ethdev.c | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index d0a8ee4..3816dba 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -42,8 +42,6 @@
#include <sys/ioctl.h>
#include <ifaddrs.h>
-#include <rte_malloc.h>
-
/* This header declares the driver interface we implement */
#include <fman.h>
#include <of.h>
@@ -72,15 +70,18 @@ if_destructor(struct __fman_if *__if)
{
struct fman_if_bpool *bp, *tmpbp;
+ if (!__if)
+ return;
+
if (__if->__if.mac_type == fman_offline)
goto cleanup;
list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) {
list_del(&bp->node);
- rte_free(bp);
+ free(bp);
}
cleanup:
- rte_free(__if);
+ free(__if);
}
static int
@@ -208,7 +209,7 @@ fman_if_init(const struct device_node *dpa_node)
mprop = "fsl,fman-mac";
/* Allocate an object for this network interface */
- __if = rte_malloc(NULL, sizeof(*__if), RTE_CACHE_LINE_SIZE);
+ __if = malloc(sizeof(*__if));
if (!__if) {
FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if));
goto err;
@@ -464,7 +465,7 @@ fman_if_init(const struct device_node *dpa_node)
uint64_t bpool_host[6] = {0};
const char *pname;
/* Allocate an object for the pool */
- bpool = rte_malloc(NULL, sizeof(*bpool), RTE_CACHE_LINE_SIZE);
+ bpool = malloc(sizeof(*bpool));
if (!bpool) {
FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*bpool));
goto err;
@@ -603,7 +604,7 @@ fman_finish(void)
-errno, strerror(errno));
printf("Tearing down %s\n", __if->node_path);
list_del(&__if->__if.node);
- rte_free(__if);
+ free(__if);
}
close(fman_ccsr_map_fd);
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 8dad97e..9f33e44 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -921,7 +921,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
/* reset bpool list, initialize bpool dynamically */
list_for_each_entry_safe(bp, tmp_bp, &cfg->fman_if->bpool_list, node) {
list_del(&bp->node);
- rte_free(bp);
+ free(bp);
}
/* Populate ethdev structure */
--
2.9.3
next prev parent reply other threads:[~2017-10-10 9:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 7:01 [dpdk-dev] [PATCH] " Shreyansh Jain
2017-10-10 7:39 ` Thomas Monjalon
2017-10-10 9:19 ` Shreyansh Jain
2017-10-10 14:05 ` santosh
2017-10-10 16:17 ` Thomas Monjalon
2017-10-10 16:55 ` santosh
2017-10-11 5:17 ` Shreyansh Jain
2017-10-11 5:23 ` santosh
2017-10-10 9:34 ` Shreyansh Jain [this message]
2017-10-10 13:13 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
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=20171010093458.19861-1-shreyansh.jain@nxp.com \
--to=shreyansh.jain@nxp.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=hemant.agrawal@nxp.com \
--cc=santosh.shukla@caviumnetworks.com \
--cc=thomas@monjalon.net \
/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).