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

gpu: nvgpu: unit: handle BUG() calls in pd_cache

Browse Source 
With the use of nvgpu_assert in pd_cache code, some tests trying
to cause failures are now causing calls to BUG() which are now
being handled with calls to EXPECT_BUG

JIRA NVGPU-677

Change-Id: Idc3696ddef30165588fe9c9dcb6ab0b7241ab5fe
Signed-off-by: Nicolas Benech <nbenech@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2020601
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Adeel Raza <araza@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nicolas Benech
2019-02-15 16:56:01 -05:00
committed by mobile promotions
parent 9db43bad82
commit 350c8ebf11
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
userspace/units/mm/gmmu/pd_cache/pd_cache.c
View File

@@ -32,6 +32,8 @@
#include <nvgpu/posix/kmem.h> #include <nvgpu/posix/kmem.h>
#include <nvgpu/posix/posix-fault-injection.h> #include <nvgpu/posix/posix-fault-injection.h>
#include <common/mm/gmmu/pd_cache_priv.h>
/* /*
* Direct allocs are allocs large enough to just pass straight on to the * Direct allocs are allocs large enough to just pass straight on to the
* DMA allocator. Basically that means the size of the PD is larger than a page. * DMA allocator. Basically that means the size of the PD is larger than a page.
@@ -318,10 +320,17 @@ static int test_pd_free_empty_pd(struct unit_module *m,
* So we will make sure we don't crash. * So we will make sure we don't crash.
*/ */
nvgpu_pd_free(&vm, &pd); nvgpu_pd_free(&vm, &pd);
nvgpu_pd_free(&vm, &pd); if (!EXPECT_BUG(nvgpu_pd_free(&vm, &pd))) {
unit_return_fail(m, "nvgpu_pd_free did not BUG() as expected");
}
/* When BUG() occurs the pd_cache lock is not released, so do it here */
nvgpu_mutex_release(&g->mm.pd_cache->lock);
pd.mem = NULL; pd.mem = NULL;
nvgpu_pd_free(&vm, &pd); if (!EXPECT_BUG(nvgpu_pd_free(&vm, &pd))) {
unit_return_fail(m, "nvgpu_pd_free did not BUG() as expected");
}
nvgpu_mutex_release(&g->mm.pd_cache->lock);
/* And now direct frees. */ /* And now direct frees. */
memset(&pd, 0U, sizeof(pd)); memset(&pd, 0U, sizeof(pd));
@@ -331,6 +340,11 @@ static int test_pd_free_empty_pd(struct unit_module *m,
} }
nvgpu_pd_free(&vm, &pd); nvgpu_pd_free(&vm, &pd);
/*
* nvgpu_pd_free calls below will not cause BUG() because pd->cached is
* true.
*/
nvgpu_pd_free(&vm, &pd); nvgpu_pd_free(&vm, &pd);
pd.mem = NULL; pd.mem = NULL;
@@ -357,8 +371,7 @@ static int test_pd_alloc_invalid_input(struct unit_module *m,
} }
/* Obviously shouldn't work pd_cache is not init'ed. */ /* Obviously shouldn't work pd_cache is not init'ed. */
err = nvgpu_pd_alloc(&vm, &pd, 2048U); if (!EXPECT_BUG(nvgpu_pd_alloc(&vm, &pd, 2048U))) {
if (err == 0) {
unit_return_fail(m, "pd_alloc worked on NULL pd_cache\n"); unit_return_fail(m, "pd_alloc worked on NULL pd_cache\n");
} }