nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add bvec check for common.fifo input

Browse Source 
This patch adds boundary value check for common.fifo parameters as
listed below.
1. nvgpu_channel_setup_bind() includes a condition to check that value
of num_gpfifo_entries does not exceed 2^31. Otherwise prints message and
returns error.
2. nvgpu_tsg_bind_channel() includes a condition to check if channel
subctx had ASYNC id. If true, runqueue selector is set to 1 and 0
otherwise. This check is to be moved from devctl to common.fifo.

Jira NVGPU-4817

Change-Id: Id1c9253945859c245e584b5c42b3285a6b620055
Signed-off-by: Vedashree Vidwans <vvidwans@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2278613
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Vedashree Vidwans
2020-01-10 13:24:14 -08:00
committed by Alex Waterman
parent df7631efc8
commit 2fb56f2cea
6 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -629,7 +629,8 @@ done:
#define F_CHANNEL_SETUP_BIND_USERMODE_POWER_REF_COUNT_FAIL BIT(8)
#define F_CHANNEL_SETUP_BIND_NON_USERMODE_DETERMINISTIC BIT(9)
#define F_CHANNEL_SETUP_BIND_USERMODE_OS_CH_USERMODE_BUF BIT(10)
#define F_CHANNEL_SETUP_BIND_LAST BIT(11)
#define F_CHANNEL_SETUP_GPFIFO_ENTRIES_OUT_OF_BOUND BIT(11)
#define F_CHANNEL_SETUP_BIND_LAST BIT(12)
static const char *f_channel_setup_bind[] = {
"no_as",
@@ -719,7 +720,8 @@ int test_channel_setup_bind(struct unit_module *m, struct gk20a *g, void *vargs)
F_CHANNEL_SETUP_BIND_USERMODE_TSGID_INVALID |
F_CHANNEL_SETUP_BIND_USERMODE_POWER_REF_COUNT_FAIL |
F_CHANNEL_SETUP_BIND_NON_USERMODE_DETERMINISTIC |
F_CHANNEL_SETUP_BIND_USERMODE_OS_CH_USERMODE_BUF;
F_CHANNEL_SETUP_BIND_USERMODE_OS_CH_USERMODE_BUF |
F_CHANNEL_SETUP_GPFIFO_ENTRIES_OUT_OF_BOUND;
u32 prune = (u32)(F_CHANNEL_SETUP_BIND_USERMODE_SUPPORT_DETERMINISTIC) |
fail;
u32 runlist_id = NVGPU_INVALID_RUNLIST_ID;
@@ -816,6 +818,10 @@ int test_channel_setup_bind(struct unit_module *m, struct gk20a *g, void *vargs)
NVGPU_SETUP_BIND_FLAGS_USERMODE_SUPPORT;
}
if (branches & F_CHANNEL_SETUP_GPFIFO_ENTRIES_OUT_OF_BOUND) {
bind_args.num_gpfifo_entries = -1;
}
ch->tsgid = branches &
F_CHANNEL_SETUP_BIND_USERMODE_TSGID_INVALID ?
NVGPU_INVALID_TSG_ID : tsgid_orig;
@@ -850,6 +856,7 @@ int test_channel_setup_bind(struct unit_module *m, struct gk20a *g, void *vargs)
unit_assert(nvgpu_atomic_read(&ch->bound) == false,
goto done);
g->os_channel.free_usermode_buffers = NULL;
bind_args.num_gpfifo_entries = 32;
} else {
unit_assert(err == 0, goto done);
unit_assert(stub[0].chid == ch->chid, goto done);

9
userspace/units/fifo/tsg/nvgpu-tsg.c
View File

@@ -262,7 +262,8 @@ done:
#define F_TSG_BIND_CHANNEL_BIND_HAL BIT(3)
#define F_TSG_BIND_CHANNEL_BIND_HAL_ERR BIT(4)
#define F_TSG_BIND_CHANNEL_ENG_METHOD_BUFFER BIT(5)
#define F_TSG_BIND_CHANNEL_LAST BIT(6)
#define F_TSG_BIND_CHANNEL_ASYNC_ID BIT(6)
#define F_TSG_BIND_CHANNEL_LAST BIT(7)
static const char *f_tsg_bind[] = {
"ch_bound",
@@ -326,6 +327,12 @@ int test_tsg_bind_channel(struct unit_module *m,
subtest_setup(branches);
ch = chB;
if (branches & F_TSG_BIND_CHANNEL_ASYNC_ID) {
ch->subctx_id = CHANNEL_INFO_VEID0 + 1;
} else {
ch->subctx_id = 0U;
}
/* ch already bound */
if (branches & F_TSG_BIND_CHANNEL_CH_BOUND) {
ch = chA;