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: fix nvs queue ctrl synchronization

Browse Source 
Change fixes the placement of the queue_lock for better synchronization.

Bug 3884011

Change-Id: Ida350eb4d9b922680aa12346ddcf31fd9c53858b
Signed-off-by: prsethi <prsethi@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2850130
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Ankur Kishore <ankkishore@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
prsethi
2023-01-29 15:37:04 +00:00
committed by mobile promotions
parent e233ea5836
commit 5d2f56f89f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/nvgpu/os/linux/ioctl_nvs.c
View File

@@ -634,14 +634,17 @@ int nvgpu_nvs_ctrl_fifo_ops_open(struct inode *inode, struct file *filp)
} }
pid = nvgpu_current_pid(g); pid = nvgpu_current_pid(g);
nvgpu_nvs_ctrl_fifo_lock_queues(g);
if (nvgpu_nvs_ctrl_fifo_user_exists(g->sched_ctrl_fifo, pid, writable)) { if (nvgpu_nvs_ctrl_fifo_user_exists(g->sched_ctrl_fifo, pid, writable)) {
nvgpu_err(g, "User already exists"); nvgpu_err(g, "User already exists");
nvgpu_nvs_ctrl_fifo_unlock_queues(g);
gk20a_idle(g); gk20a_idle(g);
return -EEXIST; return -EEXIST;
} }
linux_user = nvgpu_kzalloc(g, sizeof(*linux_user)); linux_user = nvgpu_kzalloc(g, sizeof(*linux_user));
if (linux_user == NULL) { if (linux_user == NULL) {
nvgpu_nvs_ctrl_fifo_unlock_queues(g);
gk20a_idle(g); gk20a_idle(g);
return -ENOMEM; return -ENOMEM;
} }
@@ -652,6 +655,7 @@ int nvgpu_nvs_ctrl_fifo_ops_open(struct inode *inode, struct file *filp)
linux_user->user.has_write_access = true; linux_user->user.has_write_access = true;
nvgpu_nvs_ctrl_fifo_add_user(g->sched_ctrl_fifo, &linux_user->user); nvgpu_nvs_ctrl_fifo_add_user(g->sched_ctrl_fifo, &linux_user->user);
nvgpu_nvs_ctrl_fifo_unlock_queues(g);
filp->private_data = linux_user; filp->private_data = linux_user;
@@ -686,9 +690,9 @@ int nvgpu_nvs_ctrl_fifo_ops_release(struct inode *inode, struct file *filp)
return -ENODEV; return -ENODEV;
} }
nvgpu_nvs_ctrl_fifo_lock_queues(g);
is_exclusive_user = nvgpu_nvs_ctrl_fifo_is_exclusive_user( is_exclusive_user = nvgpu_nvs_ctrl_fifo_is_exclusive_user(
g->sched_ctrl_fifo, &linux_user->user); g->sched_ctrl_fifo, &linux_user->user);
nvgpu_nvs_ctrl_fifo_lock_queues(g);
if (is_exclusive_user) { if (is_exclusive_user) {
num_queue = NVGPU_NVS_NUM_CONTROL; num_queue = NVGPU_NVS_NUM_CONTROL;
if (nvgpu_nvs_buffer_is_sendq_valid(g)) { if (nvgpu_nvs_buffer_is_sendq_valid(g)) {
@@ -852,14 +856,13 @@ static int nvgpu_nvs_ctrl_fifo_create_queue(struct gk20a *g,
size_t queue_size; size_t queue_size;
u8 mask = 0; u8 mask = 0;
nvgpu_nvs_ctrl_fifo_lock_queues(g);
err = nvgpu_nvs_ctrl_fifo_create_queue_verify_flags(g, user, args); err = nvgpu_nvs_ctrl_fifo_create_queue_verify_flags(g, user, args);
if (err != 0) { if (err != 0) {
args->dmabuf_fd = -1; args->dmabuf_fd = -1;
return err; goto fail;
} }
nvgpu_nvs_ctrl_fifo_lock_queues(g);
num_queue = nvgpu_nvs_translate_queue_num(args->queue_num); num_queue = nvgpu_nvs_translate_queue_num(args->queue_num);
queue_direction = nvgpu_nvs_translate_queue_direction(args->direction); queue_direction = nvgpu_nvs_translate_queue_direction(args->direction);