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: unit: bitmap_allocator: fix init crashes

Browse Source 
While fixing CERT-C issues in the bitmap_allocator, a number of
asserts were added. In particular, if blk_size is 0 it will cause
a BUG(). Within the bitmap_allocator unit test, the init will try
to set blk_size to 0 to make sure it fails. Now the failure is a
BUG(), not a return code. So this fix adds EXPECT_BUG where needed.

JIRA NVGPU-906

Change-Id: I62ae725e494a7cf561ac8cac7685cffbbc8de38e
Signed-off-by: Nicolas Benech <nbenech@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2135823
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@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-06-13 10:29:27 -04:00
committed by mobile promotions
parent 344eceb739
commit 1deb1fa176
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
userspace/units/mm/allocators/bitmap_allocator/bitmap_allocator.c
View File

@@ -303,8 +303,8 @@ static int test_nvgpu_bitmap_allocator_init(struct unit_module *m,
}
/* base = 0, length = 0, blk_size = 0 */
if (nvgpu_allocator_init(g, na, NULL, "test_bitmap", 0ULL, 0ULL, 0ULL,
0ULL, flags, BITMAP_ALLOCATOR) == 0) {
if (!EXPECT_BUG(nvgpu_allocator_init(g, na, NULL, "test_bitmap", 0ULL,
0ULL, 0ULL, 0ULL, flags, BITMAP_ALLOCATOR))) {
na->ops->fini(na);
unit_return_fail(m,
"bitmap inited despite blk_size = base = length = 0\n");
@@ -314,9 +314,9 @@ static int test_nvgpu_bitmap_allocator_init(struct unit_module *m,
* blk_size = 0
* Since base and length are not aligned with 0, init fails
*/
if (nvgpu_allocator_init(g, na, NULL, "test_bitmap", base, length,
0ULL, 0ULL, flags, BITMAP_ALLOCATOR) == 0) {
unit_return_fail(m, "bitmap init failed for blk_size=0\n");
if (!EXPECT_BUG(nvgpu_allocator_init(g, na, NULL, "test_bitmap", base,
length, 0ULL, 0ULL, flags, BITMAP_ALLOCATOR))) {
unit_return_fail(m, "bitmap inited despite blk_size=0\n");
}
/* Odd blk_size */