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: check for extra mapping flags

Browse Source 
User space may erroneously provide extra flags for buffer
mappings which always get silently ignored without any
error. It would be better to return error to catch cases
of ABI mismatches.

This patch checks if any extra flags were provided and
returns error if this is the case.

Jira NVGPU-6640
Bug 3489827

Change-Id: Ib226f049f81bef48bf00656259ed97ba0a3eb47c
Signed-off-by: Martin Radev <mradev@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2676684
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Martin Radev
2022-03-02 11:38:47 +02:00
committed by mobile promotions
parent 8cba20ff42
commit 30c434efc1
1 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/gpu/nvgpu/os/linux/vm.c
View File

@@ -41,40 +41,65 @@
#define dev_from_vm(vm) dev_from_gk20a(vm->mm->g) #define dev_from_vm(vm) dev_from_gk20a(vm->mm->g)
static u32 nvgpu_vm_translate_linux_flags(struct gk20a *g, u32 flags) static int nvgpu_vm_translate_linux_flags(struct gk20a *g, u32 flags, u32 *out_core_flags)
{ {
u32 core_flags = 0; u32 core_flags = 0;
u32 consumed_flags = 0;
u32 map_access_bitmask = u32 map_access_bitmask =
(BIT32(NVGPU_AS_MAP_BUFFER_FLAGS_ACCESS_BITMASK_SIZE) - 1U) << (BIT32(NVGPU_AS_MAP_BUFFER_FLAGS_ACCESS_BITMASK_SIZE) - 1U) <<
NVGPU_AS_MAP_BUFFER_FLAGS_ACCESS_BITMASK_OFFSET; NVGPU_AS_MAP_BUFFER_FLAGS_ACCESS_BITMASK_OFFSET;
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET) if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET) != 0U) {
core_flags |= NVGPU_VM_MAP_FIXED_OFFSET; core_flags |= NVGPU_VM_MAP_FIXED_OFFSET;
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE) consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET;
core_flags |= NVGPU_VM_MAP_CACHEABLE;
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_IO_COHERENT)
core_flags |= NVGPU_VM_MAP_IO_COHERENT;
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE)
core_flags |= NVGPU_VM_MAP_UNMAPPED_PTE;
if (!nvgpu_is_enabled(g, NVGPU_DISABLE_L3_SUPPORT)) {
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_L3_ALLOC)
core_flags |= NVGPU_VM_MAP_L3_ALLOC;
} }
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL) if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE) != 0U) {
core_flags |= NVGPU_VM_MAP_CACHEABLE;
consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_IO_COHERENT) != 0U) {
core_flags |= NVGPU_VM_MAP_IO_COHERENT;
consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_IO_COHERENT;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE) != 0U) {
core_flags |= NVGPU_VM_MAP_UNMAPPED_PTE;
consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_L3_ALLOC) != 0U &&
!nvgpu_is_enabled(g, NVGPU_DISABLE_L3_SUPPORT)) {
core_flags |= NVGPU_VM_MAP_L3_ALLOC;
consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_L3_ALLOC;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL) != 0U) {
core_flags |= NVGPU_VM_MAP_DIRECT_KIND_CTRL; core_flags |= NVGPU_VM_MAP_DIRECT_KIND_CTRL;
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_PLATFORM_ATOMIC) consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_DIRECT_KIND_CTRL;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_PLATFORM_ATOMIC) != 0U) {
core_flags |= NVGPU_VM_MAP_PLATFORM_ATOMIC; core_flags |= NVGPU_VM_MAP_PLATFORM_ATOMIC;
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_TEGRA_RAW) consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_PLATFORM_ATOMIC;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_TEGRA_RAW) != 0U) {
core_flags |= NVGPU_VM_MAP_TEGRA_RAW; core_flags |= NVGPU_VM_MAP_TEGRA_RAW;
consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_TEGRA_RAW;
}
if ((flags & NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS) != 0U) {
nvgpu_warn(g, "Ignoring deprecated flag: "
"NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS");
consumed_flags |= NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS;
}
/* copy the map access bitfield from flags */ /* copy the map access bitfield from flags */
core_flags |= (flags & map_access_bitmask); core_flags |= (flags & map_access_bitmask);
consumed_flags |= (flags & map_access_bitmask);
if (flags & NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS) if (consumed_flags != flags) {
nvgpu_warn(g, "Ignoring deprecated flag: " nvgpu_err(g, "Extra flags: 0x%x", consumed_flags ^ flags);
"NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS"); return -EINVAL;
}
return core_flags; *out_core_flags = core_flags;
return 0;
} }
static int nvgpu_vm_translate_map_access(struct gk20a *g, u32 flags, static int nvgpu_vm_translate_map_access(struct gk20a *g, u32 flags,
@@ -341,6 +366,7 @@ int nvgpu_vm_map_buffer(struct vm_gk20a *vm,
struct gk20a *g = gk20a_from_vm(vm); struct gk20a *g = gk20a_from_vm(vm);
struct dma_buf *dmabuf; struct dma_buf *dmabuf;
u32 map_access; u32 map_access;
u32 core_flags;
u64 ret_va; u64 ret_va;
int err = 0; int err = 0;
@@ -404,8 +430,14 @@ int nvgpu_vm_map_buffer(struct vm_gk20a *vm,
return -EINVAL; return -EINVAL;
} }
err = nvgpu_vm_translate_linux_flags(g, flags, &core_flags);
if (err < 0) {
dma_buf_put(dmabuf);
return err;
}
err = nvgpu_vm_map_linux(vm, dmabuf, *map_addr, map_access, err = nvgpu_vm_map_linux(vm, dmabuf, *map_addr, map_access,
nvgpu_vm_translate_linux_flags(g, flags), core_flags,
page_size, page_size,
compr_kind, incompr_kind, compr_kind, incompr_kind,
buffer_offset, buffer_offset,