d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus/dpaa: fix memory allocation during scan

Browse Source 
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")

Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
This commit is contained in:
Shreyansh Jain 2017-10-10 15:04:58 +05:30 committed by Thomas Monjalon
parent 7a88893246
commit 1459585888
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/bus/dpaa/base/fman/fman.c
View File

@ -42,8 +42,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <ifaddrs.h> #include <ifaddrs.h>
#include <rte_malloc.h>
/* This header declares the driver interface we implement */ /* This header declares the driver interface we implement */
#include <fman.h> #include <fman.h>
#include <of.h> #include <of.h>
@ -72,15 +70,18 @@ if_destructor(struct __fman_if *__if)
{ {
struct fman_if_bpool *bp, *tmpbp; struct fman_if_bpool *bp, *tmpbp;
if (!__if)
return;
if (__if->__if.mac_type == fman_offline) if (__if->__if.mac_type == fman_offline)
goto cleanup; goto cleanup;
list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) { list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) {
list_del(&bp->node); list_del(&bp->node);
rte_free(bp); free(bp);
} }
cleanup: cleanup:
rte_free(__if); free(__if);
} }
static int static int
@ -208,7 +209,7 @@ fman_if_init(const struct device_node *dpa_node)
mprop = "fsl,fman-mac"; mprop = "fsl,fman-mac";
/* Allocate an object for this network interface */ /* Allocate an object for this network interface */
__if = rte_malloc(NULL, sizeof(*__if), RTE_CACHE_LINE_SIZE); __if = malloc(sizeof(*__if));
if (!__if) { if (!__if) {
FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if)); FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if));
goto err; goto err;
@ -464,7 +465,7 @@ fman_if_init(const struct device_node *dpa_node)
uint64_t bpool_host[6] = {0}; uint64_t bpool_host[6] = {0};
const char *pname; const char *pname;
/* Allocate an object for the pool */ /* Allocate an object for the pool */
bpool = rte_malloc(NULL, sizeof(*bpool), RTE_CACHE_LINE_SIZE); bpool = malloc(sizeof(*bpool));
if (!bpool) { if (!bpool) {
FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*bpool)); FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*bpool));
goto err; goto err;
@ -603,7 +604,7 @@ fman_finish(void)
-errno, strerror(errno)); -errno, strerror(errno));
printf("Tearing down %s\n", __if->node_path); printf("Tearing down %s\n", __if->node_path);
list_del(&__if->__if.node); list_del(&__if->__if.node);
rte_free(__if); free(__if);
} }
close(fman_ccsr_map_fd); close(fman_ccsr_map_fd);

2
drivers/net/dpaa/dpaa_ethdev.c
View File

@ -921,7 +921,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
/* reset bpool list, initialize bpool dynamically */ /* reset bpool list, initialize bpool dynamically */
list_for_each_entry_safe(bp, tmp_bp, &cfg->fman_if->bpool_list, node) { list_for_each_entry_safe(bp, tmp_bp, &cfg->fman_if->bpool_list, node) {
list_del(&bp->node); list_del(&bp->node);
rte_free(bp); free(bp);
} }
/* Populate ethdev structure */ /* Populate ethdev structure */