From 778f6b28749ff52e665294d3a468875b86b03155 Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Fri, 3 May 2019 09:28:21 -0700 Subject: [PATCH] gpu: nvgpu: fix MISRA 21.3 mm nvgpu allocator MISRA rule 21.3 forbids from using calloc, malloc, realloc and free identifiers for function or macro names. This patch renames nvgpu allocator free operator to free_alloc to follow rule 21.3. Jira NVGPU-3336 Change-Id: Ie9f48d567255a3e1dca70632fbe3d36b45023f3f Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/2111365 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../gpu/nvgpu/common/mm/allocators/bitmap_allocator.c | 2 +- .../gpu/nvgpu/common/mm/allocators/buddy_allocator.c | 2 +- .../nvgpu/common/mm/allocators/lockless_allocator.c | 4 ++-- .../gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c | 5 +++-- .../gpu/nvgpu/common/mm/allocators/page_allocator.c | 2 +- drivers/gpu/nvgpu/include/nvgpu/allocator.h | 2 +- .../mm/allocators/bitmap_allocator/bitmap_allocator.c | 8 ++++---- .../mm/allocators/buddy_allocator/buddy_allocator.c | 10 +++++----- .../mm/allocators/nvgpu_allocator/nvgpu_allocator.c | 8 ++++---- .../mm/allocators/page_allocator/page_allocator.c | 6 +++--- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator.c index dedb5398d..965fa3032 100644 --- a/drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/allocators/bitmap_allocator.c @@ -373,7 +373,7 @@ static void nvgpu_bitmap_print_stats(struct nvgpu_allocator *na, static const struct nvgpu_allocator_ops bitmap_ops = { .alloc = nvgpu_bitmap_balloc, - .free = nvgpu_bitmap_free, + .free_alloc = nvgpu_bitmap_free, .alloc_fixed = nvgpu_bitmap_balloc_fixed, .free_fixed = nvgpu_bitmap_free_fixed, diff --git a/drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator.c index 987191bfd..929308908 100644 --- a/drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/allocators/buddy_allocator.c @@ -1262,7 +1262,7 @@ static void nvgpu_buddy_print_stats(struct nvgpu_allocator *na, static const struct nvgpu_allocator_ops buddy_ops = { .alloc = nvgpu_buddy_balloc, .alloc_pte = nvgpu_buddy_balloc_pte, - .free = nvgpu_buddy_bfree, + .free_alloc = nvgpu_buddy_bfree, .alloc_fixed = nvgpu_balloc_fixed_buddy, /* .free_fixed not needed. */ diff --git a/drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator.c index a7efaf047..2cffdd65e 100644 --- a/drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/allocators/lockless_allocator.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -147,7 +147,7 @@ static void nvgpu_lockless_print_stats(struct nvgpu_allocator *a, static const struct nvgpu_allocator_ops pool_ops = { .alloc = nvgpu_lockless_alloc, - .free = nvgpu_lockless_free, + .free_alloc = nvgpu_lockless_free, .base = nvgpu_lockless_alloc_base, .length = nvgpu_lockless_alloc_length, diff --git a/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c index 1217e02e2..e9c37e99d 100644 --- a/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/allocators/nvgpu_allocator.c @@ -83,7 +83,7 @@ u64 nvgpu_alloc_pte(struct nvgpu_allocator *a, u64 len, u32 page_size) void nvgpu_free(struct nvgpu_allocator *a, u64 addr) { - a->ops->free(a, addr); + a->ops->free_alloc(a, addr); } u64 nvgpu_alloc_fixed(struct nvgpu_allocator *a, u64 base, u64 len, @@ -158,7 +158,8 @@ int nvgpu_alloc_common_init(struct nvgpu_allocator *a, struct gk20a *g, * This is the bare minimum operations required for a sensible * allocator. */ - if (ops->alloc == NULL || ops->free == NULL || ops->fini == NULL) { + if (ops->alloc == NULL || ops->free_alloc == NULL || + ops->fini == NULL) { return -EINVAL; } diff --git a/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c b/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c index 913e3852e..4f6778b93 100644 --- a/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/allocators/page_allocator.c @@ -955,7 +955,7 @@ static void nvgpu_page_print_stats(struct nvgpu_allocator *na, static const struct nvgpu_allocator_ops page_ops = { .alloc = nvgpu_page_alloc, - .free = nvgpu_page_free, + .free_alloc = nvgpu_page_free, .alloc_fixed = nvgpu_page_alloc_fixed, .free_fixed = nvgpu_page_free_fixed, diff --git a/drivers/gpu/nvgpu/include/nvgpu/allocator.h b/drivers/gpu/nvgpu/include/nvgpu/allocator.h index 6b131b481..810c912da 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/allocator.h +++ b/drivers/gpu/nvgpu/include/nvgpu/allocator.h @@ -51,7 +51,7 @@ struct nvgpu_allocator_ops { u64 (*alloc)(struct nvgpu_allocator *allocator, u64 len); u64 (*alloc_pte)(struct nvgpu_allocator *allocator, u64 len, u32 page_size); - void (*free)(struct nvgpu_allocator *allocator, u64 addr); + void (*free_alloc)(struct nvgpu_allocator *allocator, u64 addr); /* * Special interface to allocate a memory region with a specific diff --git a/userspace/units/mm/allocators/bitmap_allocator/bitmap_allocator.c b/userspace/units/mm/allocators/bitmap_allocator/bitmap_allocator.c index bc82f2bae..f86b3997c 100644 --- a/userspace/units/mm/allocators/bitmap_allocator/bitmap_allocator.c +++ b/userspace/units/mm/allocators/bitmap_allocator/bitmap_allocator.c @@ -101,7 +101,7 @@ static int test_nvgpu_bitmap_allocator_critical(struct unit_module *m, goto fail; } - na->ops->free(na, addr1); + na->ops->free_alloc(na, addr1); na->ops->free_fixed(na, SZ_4K, SZ_8K); @@ -162,9 +162,9 @@ static int test_nvgpu_bitmap_allocator_alloc(struct unit_module *m, } nvgpu_posix_enable_fault_injection(kmem_fi, false, 0); - na->ops->free(na, alloc3k); + na->ops->free_alloc(na, alloc3k); - na->ops->free(na, alloc3k); + na->ops->free_alloc(na, alloc3k); alloc4k = na->ops->alloc(na, SZ_4K); if (alloc4k == 0) { @@ -221,7 +221,7 @@ static int test_nvgpu_bitmap_allocator_alloc(struct unit_module *m, "freeing unaligned base didn't trigger BUG()\n"); } - na->ops->free(na, alloc4k); + na->ops->free_alloc(na, alloc4k); /* * Allocate 4K diff --git a/userspace/units/mm/allocators/buddy_allocator/buddy_allocator.c b/userspace/units/mm/allocators/buddy_allocator/buddy_allocator.c index c9b095f33..642872e97 100644 --- a/userspace/units/mm/allocators/buddy_allocator/buddy_allocator.c +++ b/userspace/units/mm/allocators/buddy_allocator/buddy_allocator.c @@ -181,7 +181,7 @@ static int test_buddy_allocator_with_big_pages(struct unit_module *m, goto fail; } - na->ops->free(na, addr1); + na->ops->free_alloc(na, addr1); /* * alloc_pte() @@ -734,11 +734,11 @@ static int test_nvgpu_buddy_allocator_basic_ops(struct unit_module *m, addr = na->ops->alloc(na, (SZ_64K >> 1)); - na->ops->free(na, addr); + na->ops->free_alloc(na, addr); - na->ops->free(na, addr); + na->ops->free_alloc(na, addr); - na->ops->free(na, 0ULL); + na->ops->free_alloc(na, 0ULL); /* * len = 2M (requesting more than available memory) @@ -751,7 +751,7 @@ static int test_nvgpu_buddy_allocator_basic_ops(struct unit_module *m, addr = na->ops->alloc_pte(na, (SZ_4K << 2), SZ_1K << 1); - na->ops->free(na, addr); + na->ops->free_alloc(na, addr); /* * Unaligned base diff --git a/userspace/units/mm/allocators/nvgpu_allocator/nvgpu_allocator.c b/userspace/units/mm/allocators/nvgpu_allocator/nvgpu_allocator.c index e50b715f1..77c2eceba 100644 --- a/userspace/units/mm/allocators/nvgpu_allocator/nvgpu_allocator.c +++ b/userspace/units/mm/allocators/nvgpu_allocator/nvgpu_allocator.c @@ -42,7 +42,7 @@ static bool dummy_op_called[OP_NUMBER]; static const char *ops_str[] = { "alloc", - "free", + "free_alloc", "alloc_pte", "alloc_fixed", "free fixed", @@ -135,7 +135,7 @@ static void dummy_fini(struct nvgpu_allocator *allocator) static struct nvgpu_allocator_ops dummy_ops = { .alloc = dummy_alloc, - .free = dummy_free, + .free_alloc = dummy_free, .alloc_pte = dummy_alloc_pte, .alloc_fixed = dummy_alloc_fixed, .free_fixed = dummy_free_fixed, @@ -271,7 +271,7 @@ static int test_nvgpu_alloc_common_init(struct unit_module *m, unit_return_fail(m, "common_init passes despite missing free(),fini()\n"); - ops.free = dummy_free; + ops.free_alloc = dummy_free; if (nvgpu_alloc_common_init(&a, NULL, "test", NULL, false, &ops) == 0) unit_return_fail(m, "common_init passes despite missing fini()\n"); @@ -305,7 +305,7 @@ static int test_nvgpu_alloc_destroy(struct unit_module *m, struct nvgpu_allocator zero_a = { }; struct nvgpu_allocator_ops ops = { .alloc = dummy_alloc, - .free = dummy_free, + .free_alloc = dummy_free, .fini = dummy_fini, }; diff --git a/userspace/units/mm/allocators/page_allocator/page_allocator.c b/userspace/units/mm/allocators/page_allocator/page_allocator.c index 799bada9f..8bb428f90 100644 --- a/userspace/units/mm/allocators/page_allocator/page_allocator.c +++ b/userspace/units/mm/allocators/page_allocator/page_allocator.c @@ -267,7 +267,7 @@ static int test_page_free(struct unit_module *m, struct gk20a *g, void *args) struct nvgpu_page_allocator *pa = page_allocator(na); pa->flags |= param->flags; - na->ops->free(na, param->ret_addr); + na->ops->free_alloc(na, param->ret_addr); pa->flags &= ~(param->flags); return UNIT_SUCCESS; @@ -430,7 +430,7 @@ static int test_page_allocator_sgt_ops(struct unit_module *m, alloc->sgt.ops->sgt_free(g, &alloc->sgt); - na->ops->free(na, addr); + na->ops->free_alloc(na, addr); return UNIT_SUCCESS; } @@ -490,7 +490,7 @@ static int test_nvgpu_page_allocator_ops(struct unit_module *m, unit_return_fail(m, "reserved carveout after alloc\n"); } - na->ops->free(na, addr); + na->ops->free_alloc(na, addr); return UNIT_SUCCESS; }