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: fix double handling in timeout

Browse Source 
The context switch timeout works by triggering a hardware timeout at 10
Hz. When handling these, we check whether a channel has actually timed
out. Currently the timeout limit can be shorter than the 10 Hz interval
which always causes us to recover a channel but would also cause
detection of progress if there was any in the interval.

Handling both situations at the same time would reuse the channel
pointer local to the function after a loop has finished and would cause
memory corruption. Fix this by making the two branches mutually
exclusive, and move the recover case to happen first because that's how
our tests assume things to work.

Jira NVGPU-967

Change-Id: I26aa0fa7fd80ab42a9a1a93a6cca2cd29c9d3f3f
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1932449
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Konsta Holtta
2018-10-22 15:22:37 +03:00
committed by mobile promotions
parent d89946b33e
commit 8ac9a53d81
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
View File

@@ -2335,29 +2335,13 @@ bool gk20a_fifo_check_tsg_ctxsw_timeout(struct tsg_gk20a *tsg,
}
}
/* if at least one channel in the TSG made some progress, reset
* accumulated timeout for all channels in the TSG. In particular,
* this resets timeout for channels that already completed their work
*/
if (progress) {
nvgpu_log_info(g, "progress on tsg=%d ch=%d",
tsg->tsgid, ch->chid);
gk20a_channel_put(ch);
*ms = g->fifo_eng_timeout_us / 1000;
nvgpu_list_for_each_entry(ch, &tsg->ch_list,
channel_gk20a, ch_entry) {
if (gk20a_channel_get(ch)) {
ch->timeout_accumulated_ms = *ms;
gk20a_channel_put(ch);
}
}
}
/* if one channel is presumed dead (no progress for too long), then
* fifo recovery is needed. we can't really figure out which channel
* caused the problem, so set timeout error notifier for all channels.
*/
if (recover) {
/*
* if one channel is presumed dead (no progress for too long),
* then fifo recovery is needed. we can't really figure out
* which channel caused the problem, so set timeout error
* notifier for all channels.
*/
nvgpu_log_info(g, "timeout on tsg=%d ch=%d",
tsg->tsgid, ch->chid);
*ms = ch->timeout_accumulated_ms;
@@ -2373,6 +2357,24 @@ bool gk20a_fifo_check_tsg_ctxsw_timeout(struct tsg_gk20a *tsg,
gk20a_channel_put(ch);
}
}
} else if (progress) {
/*
* if at least one channel in the TSG made some progress, reset
* accumulated timeout for all channels in the TSG. In
* particular, this resets timeout for channels that already
* completed their work
*/
nvgpu_log_info(g, "progress on tsg=%d ch=%d",
tsg->tsgid, ch->chid);
gk20a_channel_put(ch);
*ms = g->fifo_eng_timeout_us / 1000;
nvgpu_list_for_each_entry(ch, &tsg->ch_list,
channel_gk20a, ch_entry) {
if (gk20a_channel_get(ch)) {
ch->timeout_accumulated_ms = *ms;
gk20a_channel_put(ch);
}
}
}
/* if we could not detect progress on any of the channel, but none