d2ed8a299c
Update some patch for uadk from mainline. To get more infomation, please visit the homepage: https://github.com/Linaro/uadk Signed-off-by: Wenkai Lin <linwenkai6@hisilicon.com>
69 lines
1.9 KiB
Diff
69 lines
1.9 KiB
Diff
From b56736c04686f0611e6b3865dd894cba62a3b0a2 Mon Sep 17 00:00:00 2001
|
|
From: Wenkai Lin <linwenkai6@hisilicon.com>
|
|
Date: Thu, 10 Mar 2022 20:03:12 +0800
|
|
Subject: [PATCH 089/109] uadk: v1: fix wd_bmm pool_init
|
|
|
|
setup br alloc and free should be checked at the same time,
|
|
wd_reserve_memory should be rolled back.
|
|
|
|
Signed-off-by: Wenkai Lin <linwenkai6@hisilicon.com>
|
|
---
|
|
v1/wd_bmm.c | 15 +++++----------
|
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/v1/wd_bmm.c b/v1/wd_bmm.c
|
|
index af59983..11f2ee8 100644
|
|
--- a/v1/wd_bmm.c
|
|
+++ b/v1/wd_bmm.c
|
|
@@ -216,7 +216,7 @@ static void *pool_init(struct wd_queue *q, struct wd_blkpool *pool,
|
|
void *addr = NULL;
|
|
|
|
/* use user's memory, and its br alloc function */
|
|
- if (setup->br.alloc) {
|
|
+ if (setup->br.alloc && setup->br.free) {
|
|
addr = setup->br.alloc(setup->br.usr, pool->act_mem_sz);
|
|
if (!addr) {
|
|
WD_ERR("failed to allocate memory in user pool.\n");
|
|
@@ -226,14 +226,15 @@ static void *pool_init(struct wd_queue *q, struct wd_blkpool *pool,
|
|
pool->usr_mem_start = addr;
|
|
if (usr_pool_init(pool)) {
|
|
WD_ERR("failed to initialize user pool.\n");
|
|
- goto err_pool_init;
|
|
+ setup->br.free(setup->br.usr, addr);
|
|
+ return NULL;
|
|
}
|
|
} else {
|
|
/* use wd to reserve memory */
|
|
addr = wd_reserve_memory(q, pool->act_mem_sz);
|
|
if (!addr) {
|
|
WD_ERR("wd pool failed to reserve memory.\n");
|
|
- goto err_pool_init;
|
|
+ return NULL;
|
|
}
|
|
|
|
pool->usr_mem_start = addr;
|
|
@@ -241,19 +242,13 @@ static void *pool_init(struct wd_queue *q, struct wd_blkpool *pool,
|
|
WD_ERR("failed to initialize wd pool.\n");
|
|
|
|
/* release q will free memory */
|
|
- goto err_pool_init;
|
|
+ return NULL;
|
|
}
|
|
setup->block_num = pool->setup.block_num;
|
|
pool->q = q;
|
|
}
|
|
|
|
return pool;
|
|
-
|
|
-err_pool_init:
|
|
- if (setup->br.alloc && setup->br.free)
|
|
- setup->br.free(setup->br.usr, addr);
|
|
-
|
|
- return NULL;
|
|
}
|
|
|
|
void *wd_blkpool_create(struct wd_queue *q, struct wd_blkpool_setup *setup)
|
|
--
|
|
2.27.0
|
|
|