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

gpu: nvgpu: ignore deterministic submit flag for safety

Browse Source 
Safety only supports usermode submits so there is no need to process
DETERMINISTIC submit flag. For safety, while processing DETERMINISTIC
submit flag we are only setting deterministic field of struct
channel_gk20a and taking power reference with gk20a_busy(). On qnx
safety deterministic field is just used to check the syncpoint
allocation and taking power reference is a noop.

Jira NVGPU-4378

Change-Id: I1dc256db7d9fab93bef8fcc42bdb36f611b3ef40
Signed-off-by: shashank singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2284644
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
shashank singh
2020-01-24 14:09:11 +05:30
committed by Alex Waterman
parent 038b928650
commit 0b4ccc7247
7 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
userspace/units/fifo/channel/gv11b/nvgpu-channel-gv11b.c
View File

@@ -284,7 +284,9 @@ int test_gv11b_channel_debug_dump(struct unit_module *m,
info->tsgid = ch->tsgid;
info->pid = ch->pid;
info->refs = nvgpu_atomic_read(&ch->ref_count);
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
info->deterministic = (branches & F_CHANNEL_DUMP_DETERMINISTIC) != 0;
#endif
info->hw_state.enabled = (branches & F_CHANNEL_DUMP_ENABLED) != 0;
info->hw_state.busy = (branches & F_CHANNEL_DUMP_BUSY) != 0;
info->hw_state.status_string = "fake";

16
userspace/units/fifo/channel/nvgpu-channel.c
View File

@@ -497,6 +497,7 @@ int test_channel_close(struct unit_module *m, struct gk20a *g, void *vargs)
ch->vm = NULL;
}
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
if (branches & F_CHANNEL_CLOSE_DETERMINISTIC) {
/* Compensate for atomic dec in gk20a_idle() */
nvgpu_atomic_set(&g->usage_count, 1);
@@ -507,6 +508,7 @@ int test_channel_close(struct unit_module *m, struct gk20a *g, void *vargs)
ch->deterministic = true;
ch->deterministic_railgate_allowed = true;
}
#endif
g->ops.gr.setup.free_subctx =
branches & F_CHANNEL_CLOSE_FREE_SUBCTX ?
@@ -601,7 +603,9 @@ int test_channel_close(struct unit_module *m, struct gk20a *g, void *vargs)
ch->subctx = NULL;
}
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
ch->deterministic = false;
#endif
ch->deterministic_railgate_allowed = false;
unit_assert(ch->usermode_submit_enabled == false, goto done);
@@ -819,6 +823,7 @@ int test_channel_setup_bind(struct unit_module *m, struct gk20a *g, void *vargs)
stub_os_channel_alloc_usermode_buffers_ENOMEM;
}
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
if (branches &
F_CHANNEL_SETUP_BIND_USERMODE_SUPPORT_DETERMINISTIC) {
bind_args.flags |=
@@ -833,6 +838,7 @@ int test_channel_setup_bind(struct unit_module *m, struct gk20a *g, void *vargs)
nvgpu_posix_enable_fault_injection(l_nvgpu_fi, true, 0);
}
#endif
if (branches &
F_CHANNEL_SETUP_BIND_NON_USERMODE_DETERMINISTIC) {
bind_args.flags |=
@@ -895,7 +901,9 @@ int test_channel_setup_bind(struct unit_module *m, struct gk20a *g, void *vargs)
nvgpu_dma_free(g, &ch->usermode_userd);
nvgpu_dma_free(g, &ch->usermode_gpfifo);
ch->userd_iova = 0U;
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
ch->deterministic = false;
#endif
nvgpu_atomic_set(&ch->bound, false);
}
bind_args.flags &=
@@ -1307,6 +1315,7 @@ done:
#define F_CHANNEL_DETERMINISTIC_UNIDLE_GK20ABUSY_FAIL BIT(2)
#define F_CHANNEL_DETERMINISTIC_IDLE_LAST BIT(3)
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
static const char *f_channel_deterministic_idle_unidle[] = {
"deterministic_channel",
"determinstic_railgate_allowed",
@@ -1440,6 +1449,7 @@ done:
return ret;
}
#endif
#define F_CHANNEL_SUSPEND_RESUME_UNSERVICEABLE_CH BIT(0)
#define F_CHANNEL_SUSPEND_RESUME_INVALID_TSGID BIT(1)
@@ -1748,9 +1758,11 @@ int test_channel_semaphore_wakeup(struct unit_module *m,
unit_verbose(m, "%s branches=%s\n", __func__,
branches_str(branches, f_channel_semaphore_wakeup));
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
if (branches & F_CHANNEL_SEMAPHORRE_WAKEUP_DETERMINISTIC_CH) {
ch->deterministic = true;
}
#endif
ch->semaphore_wq.initialized = branches &
F_CHANNEL_SEMAPHORRE_WAKEUP_COND_BROADCAST_FAIL ?
@@ -1765,7 +1777,9 @@ int test_channel_semaphore_wakeup(struct unit_module *m,
nvgpu_channel_semaphore_wakeup(g, false);
unit_assert(stub[0].count == (global_count - 1U), goto done);
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
ch->deterministic = false;
#endif
}
ret = UNIT_SUCCESS;
@@ -1993,7 +2007,9 @@ struct unit_module_test nvgpu_channel_tests[] = {
UNIT_TEST(ch_abort, test_channel_abort, &unit_ctx, 0),
UNIT_TEST(mark_error, test_channel_mark_error, &unit_ctx, 0),
UNIT_TEST(sw_quiesce, test_channel_sw_quiesce, &unit_ctx, 0),
#ifdef CONFIG_NVGPU_IOCTL_NON_FUSA
UNIT_TEST(idle_unidle, test_channel_deterministic_idle_unidle, &unit_ctx, 0),
#endif
UNIT_TEST(suspend_resume, test_channel_suspend_resume_serviceable_chs, &unit_ctx, 0),
UNIT_TEST(debug_dump, test_channel_debug_dump, &unit_ctx, 0),
UNIT_TEST(semaphore_wakeup, test_channel_semaphore_wakeup, &unit_ctx, 0),