From 9efadcdfc07572d789f8f2581af70d03cf5cbde4 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 8 Mar 2017 15:30:40 +0530 Subject: gpu: nvgpu: check return value of mutex_init for semaphores - check return value of nvgpu_mutex_init for semaphores - add corresponding nvgpu_mutex_destroy calls Jira NVGPU-13 Change-Id: I5404dbd29e3fce29f1a445eb2e6ce8e1d1b616c4 Signed-off-by: Deepak Nibade Reviewed-on: http://git-master/r/1317138 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: Navneet Kumar --- drivers/gpu/nvgpu/common/semaphore.c | 30 ++++++++++++++++++++++++----- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 1 + drivers/gpu/nvgpu/include/nvgpu/semaphore.h | 1 + 3 files changed, 27 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/common/semaphore.c b/drivers/gpu/nvgpu/common/semaphore.c index 919f26ec..e4099bd1 100644 --- a/drivers/gpu/nvgpu/common/semaphore.c +++ b/drivers/gpu/nvgpu/common/semaphore.c @@ -64,6 +64,16 @@ out: return ret; } +void gk20a_semaphore_sea_destroy(struct gk20a *g) +{ + if (!g->sema_sea) + return; + + nvgpu_mutex_destroy(&g->sema_sea->sea_lock); + kfree(g->sema_sea); + g->sema_sea = NULL; +} + /* * Create the semaphore sea. Only create it once - subsequent calls to this will * return the originally created sea pointer. @@ -81,15 +91,18 @@ struct nvgpu_semaphore_sea *nvgpu_semaphore_sea_create(struct gk20a *g) g->sema_sea->page_count = 0; g->sema_sea->gk20a = g; INIT_LIST_HEAD(&g->sema_sea->pool_list); - nvgpu_mutex_init(&g->sema_sea->sea_lock); + if (nvgpu_mutex_init(&g->sema_sea->sea_lock)) + goto cleanup_free; if (__nvgpu_semaphore_sea_grow(g->sema_sea)) - goto cleanup; + goto cleanup_destroy; gpu_sema_dbg("Created semaphore sea!"); return g->sema_sea; -cleanup: +cleanup_destroy: + nvgpu_mutex_destroy(&g->sema_sea->sea_lock); +cleanup_free: kfree(g->sema_sea); g->sema_sea = NULL; gpu_sema_dbg("Failed to creat semaphore sea!"); @@ -124,10 +137,14 @@ struct nvgpu_semaphore_pool *nvgpu_semaphore_pool_alloc( __lock_sema_sea(sea); + err = nvgpu_mutex_init(&p->pool_lock); + if (err) + goto fail; + ret = __semaphore_bitmap_alloc(sea->pools_alloced, SEMAPHORE_POOL_COUNT); if (ret < 0) { err = ret; - goto fail; + goto fail_alloc; } page_idx = (unsigned long)ret; @@ -138,7 +155,6 @@ struct nvgpu_semaphore_pool *nvgpu_semaphore_pool_alloc( p->sema_sea = sea; INIT_LIST_HEAD(&p->hw_semas); kref_init(&p->ref); - nvgpu_mutex_init(&p->pool_lock); sea->page_count++; list_add(&p->pool_list_entry, &sea->pool_list); @@ -148,6 +164,8 @@ struct nvgpu_semaphore_pool *nvgpu_semaphore_pool_alloc( return p; +fail_alloc: + nvgpu_mutex_destroy(&p->pool_lock); fail: __unlock_sema_sea(sea); kfree(p); @@ -309,6 +327,8 @@ static void nvgpu_semaphore_pool_free(struct kref *ref) list_for_each_entry_safe(hw_sema, tmp, &p->hw_semas, hw_sema_list) kfree(hw_sema); + nvgpu_mutex_destroy(&p->pool_lock); + gpu_sema_dbg("Freed semaphore pool! (idx=%d)", p->page_idx); kfree(p); } diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 2ff54653..a857390b 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -832,6 +832,7 @@ static void gk20a_remove_mm_support(struct mm_gk20a *mm) gk20a_free_inst_block(gk20a_from_mm(mm), &mm->hwpm.inst_block); gk20a_vm_remove_support_nofree(&mm->cde.vm); + gk20a_semaphore_sea_destroy(g); gk20a_vidmem_destroy(g); } diff --git a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h index 6f479383..6c9b8118 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h +++ b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h @@ -150,6 +150,7 @@ struct nvgpu_semaphore_sea { * Semaphore sea functions. */ struct nvgpu_semaphore_sea *nvgpu_semaphore_sea_create(struct gk20a *gk20a); +void gk20a_semaphore_sea_destroy(struct gk20a *g); int nvgpu_semaphore_sea_map(struct nvgpu_semaphore_pool *sea, struct vm_gk20a *vm); void nvgpu_semaphore_sea_unmap(struct nvgpu_semaphore_pool *sea, -- cgit v1.2.2