nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: use fixed address mapping for pma byte buffer

Browse Source 
Use fixed address mapping for pma byte buffer so that the address of
this buffer always fits in 32 bits.

This also requires to move unmap sequence to OS specific function since
different unmap API is now needed for linux and QNX.

Also call nvgpu_prof_free_pma_stream_priv_data() before
nvgpu_profiler_free_pma_stream() since former uses mm->perfbuf which
is released in later.

Bug 2510974
Jira NVGPU-5360

Change-Id: I398b0ca4f96527d6e09c9aacacb4b43c90f5bfc9
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2424691
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Deepak Nibade
2020-10-07 17:45:30 +05:30
committed by Alex Waterman
parent 7e6dcade98
commit c6aae8c049
4 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/nvgpu/common/perf/perfbuf.c
View File

@@ -25,6 +25,11 @@
#include <nvgpu/perfbuf.h>
#include <nvgpu/gk20a.h>
#include <nvgpu/nvgpu_init.h>
#include <nvgpu/vm_area.h>
#include <nvgpu/utils.h>
#define PERFBUF_PMA_BYTES_AVAILABLE_BUFFER_FIXED_GPU_VA 0x4000000ULL
#define PERFBUF_PMA_BYTES_AVAILABLE_BUFFER_MAX_SIZE NVGPU_CPU_PAGE_SIZE
int nvgpu_perfbuf_enable_locked(struct gk20a *g, u64 offset, u32 size)
{
@@ -92,6 +97,24 @@ int nvgpu_perfbuf_init_vm(struct gk20a *g)
return -ENOMEM;
}
/*
* PMA available byte buffer GPU_VA needs to fit in 32 bit
* register, hence use a fixed GPU_VA to map it.
* Only one PMA stream is allowed right now so this works.
* This should be updated later to support multiple PMA streams.
*/
mm->perfbuf.pma_bytes_available_buffer_gpu_va =
PERFBUF_PMA_BYTES_AVAILABLE_BUFFER_FIXED_GPU_VA;
err = nvgpu_vm_area_alloc(mm->perfbuf.vm,
PERFBUF_PMA_BYTES_AVAILABLE_BUFFER_MAX_SIZE / SZ_4K,
SZ_4K, &mm->perfbuf.pma_bytes_available_buffer_gpu_va,
NVGPU_VM_AREA_ALLOC_FIXED_OFFSET);
if (err != 0) {
nvgpu_vm_put(mm->perfbuf.vm);
return err;
}
err = g->ops.perfbuf.init_inst_block(g);
if (err != 0) {
nvgpu_vm_put(mm->perfbuf.vm);
@@ -109,7 +132,12 @@ void nvgpu_perfbuf_deinit_inst_block(struct gk20a *g)
void nvgpu_perfbuf_deinit_vm(struct gk20a *g)
{
struct mm_gk20a *mm = &g->mm;
g->ops.perfbuf.deinit_inst_block(g);
nvgpu_vm_area_free(mm->perfbuf.vm,
mm->perfbuf.pma_bytes_available_buffer_gpu_va);
nvgpu_vm_put(g->mm.perfbuf.vm);
}

19
drivers/gpu/nvgpu/common/profiler/profiler.c
View File

@@ -538,21 +538,10 @@ int nvgpu_profiler_alloc_pma_stream(struct nvgpu_profiler_object *prof)
void nvgpu_profiler_free_pma_stream(struct nvgpu_profiler_object *prof)
{
struct gk20a *g = prof->g;
struct mm_gk20a *mm = &g->mm;
if (prof->pma_buffer_va == 0U) {
return;
if (prof->reserved[NVGPU_PROFILER_PM_RESOURCE_TYPE_PMA_STREAM]) {
nvgpu_perfbuf_deinit_vm(g);
nvgpu_profiler_pm_resource_release(prof,
NVGPU_PROFILER_PM_RESOURCE_TYPE_PMA_STREAM);
}
nvgpu_vm_unmap(mm->perfbuf.vm, prof->pma_bytes_available_buffer_va, NULL);
prof->pma_bytes_available_buffer_va = 0U;
nvgpu_vm_unmap(mm->perfbuf.vm, prof->pma_buffer_va, NULL);
prof->pma_buffer_va = 0U;
prof->pma_buffer_size = 0U;
nvgpu_perfbuf_deinit_vm(g);
nvgpu_profiler_pm_resource_release(prof,
NVGPU_PROFILER_PM_RESOURCE_TYPE_PMA_STREAM);
}