Skip to content

Commit 6262535

Browse files
Jyri Sarhakv2019i
authored andcommitted
module: Move container_get() after MEM_API_CHECK_THREAD()
Move container_get() after MEM_API_CHECK_THREAD(). This change may help debugging if container_get() crashes when memory API functions are called from wrong thread. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
1 parent 9288b27 commit 6262535

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

src/audio/module_adapter/module/generic.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,13 @@ static void container_put(struct processing_module *mod, struct module_resource
172172
*/
173173
void *mod_balloc_align(struct processing_module *mod, size_t size, size_t alignment)
174174
{
175-
struct module_resource *container = container_get(mod);
176175
struct module_resources *res = &mod->priv.resources;
176+
struct module_resource *container;
177177
void *ptr;
178178

179179
MEM_API_CHECK_THREAD(res);
180+
181+
container = container_get(mod);
180182
if (!container)
181183
return NULL;
182184

@@ -235,11 +237,13 @@ EXPORT_SYMBOL(mod_balloc);
235237
*/
236238
void *mod_alloc_align(struct processing_module *mod, size_t size, size_t alignment)
237239
{
238-
struct module_resource *container = container_get(mod);
239240
struct module_resources *res = &mod->priv.resources;
241+
struct module_resource *container;
240242
void *ptr;
241243

242244
MEM_API_CHECK_THREAD(res);
245+
246+
container = container_get(mod);
243247
if (!container)
244248
return NULL;
245249

@@ -317,10 +321,12 @@ struct comp_data_blob_handler *
317321
mod_data_blob_handler_new(struct processing_module *mod)
318322
{
319323
struct module_resources *res = &mod->priv.resources;
320-
struct module_resource *container = container_get(mod);
321324
struct comp_data_blob_handler *bhp;
325+
struct module_resource *container;
322326

323327
MEM_API_CHECK_THREAD(res);
328+
329+
container = container_get(mod);
324330
if (!container)
325331
return NULL;
326332

@@ -351,10 +357,12 @@ EXPORT_SYMBOL(mod_data_blob_handler_new);
351357
const void *mod_fast_get(struct processing_module *mod, const void * const dram_ptr, size_t size)
352358
{
353359
struct module_resources *res = &mod->priv.resources;
354-
struct module_resource *container = container_get(mod);
360+
struct module_resource *container;
355361
const void *ptr;
356362

357363
MEM_API_CHECK_THREAD(res);
364+
365+
container = container_get(mod);
358366
if (!container)
359367
return NULL;
360368

0 commit comments

Comments
 (0)