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: Update KMDI mapping interface

Browse Source 
Finding gpu va mapping inside a given range is a two step process where
in first step number of mapping are queried and at second step it
queries for all the continues mapping range for that given gpu va
range. Mapping interface should count and return number of mappings if
input count is 0 in place of failing it.
Patch make the change for this two step process and only returns count
at first step and in second step returns the continues memory ranges.

Patch also replaces nvgpu_zalloc with nvgpu_big_zalloc to handle bigger
size allocation.

Bug 200722275

Change-Id: I56428deafa560ac8471c78f102bb1f9dbe20cabc
Signed-off-by: prsethi <prsethi@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2591043
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
prsethi
2021-09-08 05:25:10 +00:00
committed by mobile promotions
parent 79ab0ba6c4
commit dd94573e55
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
View File

@@ -2300,6 +2300,7 @@ static void nvgpu_dbg_gpu_get_valid_mappings(struct nvgpu_channel *ch, u64 start
struct dma_buf *dmabuf = NULL;
u32 f_mode = FMODE_READ;
u32 count = 0;
bool just_count = *buf_count ? false : true;
nvgpu_mutex_acquire(&vm->update_gmmu_lock);
@@ -2340,10 +2341,14 @@ static void nvgpu_dbg_gpu_get_valid_mappings(struct nvgpu_channel *ch, u64 start
} else {
size = min(end, mbuf_curr->addr
+ mbuf_curr->size) - key;
if (just_count == false) {
buffer[count].gpu_va = mbuf_curr->addr;
}
}
if (just_count == false) {
buffer[count].size = size;
}
(count)++;
if (count == count_lmt) {
@@ -2368,7 +2373,7 @@ static int nvgpu_dbg_gpu_get_mappings(struct dbg_session_gk20a *dbg_s,
struct nvgpu_channel *ch;
u64 start = arg->va_lo;
u64 end = arg->va_hi;
u32 count_in = 0U;
u32 count_in = arg->count;
u32 buf_len = 0U;
struct nvgpu_dbg_gpu_get_mappings_entry *buffer = NULL;
@@ -2377,12 +2382,6 @@ static int nvgpu_dbg_gpu_get_mappings(struct dbg_session_gk20a *dbg_s,
return -EINVAL;
}
count_in = arg->count;
if (count_in == 0U) {
nvgpu_err(g, "Invalid input param");
return -EINVAL;
}
err = gk20a_busy(g);
if (err) {
nvgpu_err(g, "failed to poweron");
@@ -2396,12 +2395,19 @@ static int nvgpu_dbg_gpu_get_mappings(struct dbg_session_gk20a *dbg_s,
goto clean_up;
}
if (count_in) {
if (arg->ops_buffer == 0UL) {
err = -EINVAL;
nvgpu_err(g, "ops_buffer is pointing to NULL");
goto clean_up;
}
buf_len = sizeof(*buffer) * count_in;
buffer = nvgpu_kzalloc(g, buf_len);
if (!buffer) {
err = -ENOMEM;
goto clean_up;
}
}
nvgpu_dbg_gpu_get_valid_mappings(ch, start, end, &arg->count,
&arg->has_more, count_in, buffer);
@@ -2410,7 +2416,7 @@ static int nvgpu_dbg_gpu_get_mappings(struct dbg_session_gk20a *dbg_s,
* Buffer will be copied to userspace only when arg->ops_buffer is not
* 0. If value of arg->ops_buffer is 0 then interface only sets count.
*/
if (arg->ops_buffer) {
if (count_in) {
err = copy_to_user((void __user *)arg->ops_buffer, buffer,
(arg->count * sizeof(*buffer)));
if (err != 0) {
@@ -2674,11 +2680,11 @@ static int nvgpu_dbg_gpu_access_gpu_va(struct dbg_session_gk20a *dbg_s,
if (size > allocated_size) {
if (buffer) {
nvgpu_kfree(g, buffer);
nvgpu_big_free(g, buffer);
buffer = NULL;
}
buffer = nvgpu_kzalloc(g, size);
buffer = nvgpu_big_zalloc(g, size);
if (buffer == NULL) {
ret = -ENOMEM;
goto fail;
@@ -2713,7 +2719,7 @@ static int nvgpu_dbg_gpu_access_gpu_va(struct dbg_session_gk20a *dbg_s,
}
fail:
if (buffer) {
nvgpu_kfree(g, buffer);
nvgpu_big_free(g, buffer);
}
if (ops_buffer) {