nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: vm: remove unreachable code

Browse Source 
There are 2 instances where some code is unreachable in vm.c
- The nvgpu_insert_mapped_buf function always returned 0, so any
  associated error handling was unreachable. This patch changes
  the function to return void instead.
- A cleanup section to unmap a buffer in case of error was also
  unreachable.

JIRA NVGPU-909

Change-Id: I6d8343b2994d314992a61dd640b10e68fbbc5e1e
Signed-off-by: Nicolas Benech <nbenech@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2217677
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: Shashank Singh <shashsingh@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nicolas Benech
2019-10-14 11:59:30 -04:00
committed by Alex Waterman
parent cb97705055
commit 6c5f67792c
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/nvgpu/common/mm/vm.c
View File

@@ -919,7 +919,7 @@ void nvgpu_vm_put(struct vm_gk20a *vm)
nvgpu_ref_put(&vm->ref, nvgpu_vm_remove_ref);
}
int nvgpu_insert_mapped_buf(struct vm_gk20a *vm,
void nvgpu_insert_mapped_buf(struct vm_gk20a *vm,
struct nvgpu_mapped_buf *mapped_buffer)
{
mapped_buffer->node.key_start = mapped_buffer->addr;
@@ -929,8 +929,6 @@ int nvgpu_insert_mapped_buf(struct vm_gk20a *vm,
nvgpu_rbtree_insert(&mapped_buffer->node, &vm->mapped_buffers);
nvgpu_assert(vm->num_user_mapped_buffers < U32_MAX);
vm->num_user_mapped_buffers++;
return 0;
}
static void nvgpu_remove_mapped_buf(struct vm_gk20a *vm,
@@ -1427,11 +1425,7 @@ int nvgpu_vm_map(struct vm_gk20a *vm,
mapped_buffer->va_allocated = va_allocated;
mapped_buffer->vm_area = vm_area;
err = nvgpu_insert_mapped_buf(vm, mapped_buffer);
if (err != 0) {
nvgpu_err(g, "failed to insert into mapped buffer tree");
goto clean_up;
}
nvgpu_insert_mapped_buf(vm, mapped_buffer);
if (vm_area != NULL) {
nvgpu_list_add_tail(&mapped_buffer->buffer_list,
@@ -1444,17 +1438,6 @@ int nvgpu_vm_map(struct vm_gk20a *vm,
return 0;
clean_up:
if (mapped_buffer->addr != 0ULL) {
g->ops.mm.gmmu.unmap(vm,
mapped_buffer->addr,
mapped_buffer->size,
mapped_buffer->pgsz_idx,
mapped_buffer->va_allocated,
gk20a_mem_flag_none,
(mapped_buffer->vm_area != NULL) ?
mapped_buffer->vm_area->sparse : false,
NULL);
}
nvgpu_mutex_release(&vm->update_gmmu_lock);
clean_up_nolock:
nvgpu_kfree(g, mapped_buffer);

2
drivers/gpu/nvgpu/include/nvgpu/vm.h
View File

@@ -307,7 +307,7 @@ struct nvgpu_mapped_buf *nvgpu_vm_find_mapped_buf_range(
struct nvgpu_mapped_buf *nvgpu_vm_find_mapped_buf_less_than(
struct vm_gk20a *vm, u64 addr);
int nvgpu_insert_mapped_buf(struct vm_gk20a *vm,
void nvgpu_insert_mapped_buf(struct vm_gk20a *vm,
struct nvgpu_mapped_buf *mapped_buffer);
/*