nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fix MISRA violations in kmem unit

Browse Source 
MISRA rule 21.2 forbids the usage of identifier names which start with
an underscore.  Fix the violations of MISRA rule 21.2 in kmem unit.

Jira NVGPU-3139

Change-Id: I20f80e8bcdc8f802bd9aea34bbf050cafdfbd72e
Signed-off-by: ajesh <akv@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2110524
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
ajesh
2019-05-02 23:41:19 +05:30
committed by mobile promotions
parent c6531d8b78
commit cfb17a1f9a
6 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/nvgpu/include/nvgpu/kmem.h
View File

@@ -117,7 +117,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* *
* This function may sleep so cannot be used in IRQs. * This function may sleep so cannot be used in IRQs.
*/ */
#define nvgpu_kmalloc(g, size) __nvgpu_kmalloc(g, size, _NVGPU_GET_IP_) #define nvgpu_kmalloc(g, size) nvgpu_kmalloc_impl(g, size, _NVGPU_GET_IP_)
/** /**
* nvgpu_kzalloc - Allocate from the kernel's allocator. * nvgpu_kzalloc - Allocate from the kernel's allocator.
@@ -128,7 +128,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* Identical to nvgpu_kalloc() except the memory will be zeroed before being * Identical to nvgpu_kalloc() except the memory will be zeroed before being
* returned. * returned.
*/ */
#define nvgpu_kzalloc(g, size) __nvgpu_kzalloc(g, size, _NVGPU_GET_IP_) #define nvgpu_kzalloc(g, size) nvgpu_kzalloc_impl(g, size, _NVGPU_GET_IP_)
/** /**
* nvgpu_kcalloc - Allocate from the kernel's allocator. * nvgpu_kcalloc - Allocate from the kernel's allocator.
@@ -141,7 +141,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* @n * @size. * @n * @size.
*/ */
#define nvgpu_kcalloc(g, n, size) \ #define nvgpu_kcalloc(g, n, size) \
__nvgpu_kcalloc(g, n, size, _NVGPU_GET_IP_) nvgpu_kcalloc_impl(g, n, size, _NVGPU_GET_IP_)
/** /**
* nvgpu_vmalloc - Allocate memory and return a map to it. * nvgpu_vmalloc - Allocate memory and return a map to it.
@@ -157,7 +157,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* *
* This function may sleep. * This function may sleep.
*/ */
#define nvgpu_vmalloc(g, size) __nvgpu_vmalloc(g, size, _NVGPU_GET_IP_) #define nvgpu_vmalloc(g, size) nvgpu_vmalloc_impl(g, size, _NVGPU_GET_IP_)
/** /**
* nvgpu_vzalloc - Allocate memory and return a map to it. * nvgpu_vzalloc - Allocate memory and return a map to it.
@@ -167,7 +167,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* *
* Identical to nvgpu_vmalloc() except this will return zero'ed memory. * Identical to nvgpu_vmalloc() except this will return zero'ed memory.
*/ */
#define nvgpu_vzalloc(g, size) __nvgpu_vzalloc(g, size, _NVGPU_GET_IP_) #define nvgpu_vzalloc(g, size) nvgpu_vzalloc_impl(g, size, _NVGPU_GET_IP_)
/** /**
* nvgpu_kfree - Frees an alloc from nvgpu_kmalloc, nvgpu_kzalloc, * nvgpu_kfree - Frees an alloc from nvgpu_kmalloc, nvgpu_kzalloc,
@@ -176,7 +176,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* @g: Current GPU. * @g: Current GPU.
* @addr: Address of object to free. * @addr: Address of object to free.
*/ */
#define nvgpu_kfree(g, addr) __nvgpu_kfree(g, addr) #define nvgpu_kfree(g, addr) nvgpu_kfree_impl(g, addr)
/** /**
* nvgpu_vfree - Frees an alloc from nvgpu_vmalloc, nvgpu_vzalloc. * nvgpu_vfree - Frees an alloc from nvgpu_vmalloc, nvgpu_vzalloc.
@@ -184,7 +184,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
* @g: Current GPU. * @g: Current GPU.
* @addr: Address of object to free. * @addr: Address of object to free.
*/ */
#define nvgpu_vfree(g, addr) __nvgpu_vfree(g, addr) #define nvgpu_vfree(g, addr) nvgpu_vfree_impl(g, addr)
#define kmem_dbg(g, fmt, args...) \ #define kmem_dbg(g, fmt, args...) \
nvgpu_log(g, gpu_dbg_kmem, fmt, ##args) nvgpu_log(g, gpu_dbg_kmem, fmt, ##args)
@@ -230,7 +230,7 @@ void nvgpu_kmem_fini(struct gk20a *g, int flags);
/* /*
* Implemented by the OS interface. * Implemented by the OS interface.
*/ */
void *__nvgpu_big_alloc(struct gk20a *g, size_t size, bool clear); void *nvgpu_big_alloc_impl(struct gk20a *g, size_t size, bool clear);
/** /**
* nvgpu_big_malloc - Pick virtual or physical alloc based on @size * nvgpu_big_malloc - Pick virtual or physical alloc based on @size
@@ -256,7 +256,7 @@ void *__nvgpu_big_alloc(struct gk20a *g, size_t size, bool clear);
*/ */
static inline void *nvgpu_big_malloc(struct gk20a *g, size_t size) static inline void *nvgpu_big_malloc(struct gk20a *g, size_t size)
{ {
return __nvgpu_big_alloc(g, size, false); return nvgpu_big_alloc_impl(g, size, false);
} }
/** /**
@@ -269,7 +269,7 @@ static inline void *nvgpu_big_malloc(struct gk20a *g, size_t size)
*/ */
static inline void *nvgpu_big_zalloc(struct gk20a *g, size_t size) static inline void *nvgpu_big_zalloc(struct gk20a *g, size_t size)
{ {
return __nvgpu_big_alloc(g, size, true); return nvgpu_big_alloc_impl(g, size, true);
} }
/** /**

16
drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -36,12 +36,12 @@ void __nvgpu_track_kfree(struct gk20a *g, void *addr);
* These are the Linux implementations of the various kmem functions defined by * These are the Linux implementations of the various kmem functions defined by
* nvgpu. This should not be included directly - instead include <nvgpu/kmem.h>. * nvgpu. This should not be included directly - instead include <nvgpu/kmem.h>.
*/ */
void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip); void *nvgpu_kmalloc_impl(struct gk20a *g, size_t size, void *ip);
void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip); void *nvgpu_kzalloc_impl(struct gk20a *g, size_t size, void *ip);
void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip); void *nvgpu_kcalloc_impl(struct gk20a *g, size_t n, size_t size, void *ip);
void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip); void *nvgpu_vmalloc_impl(struct gk20a *g, unsigned long size, void *ip);
void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip); void *nvgpu_vzalloc_impl(struct gk20a *g, unsigned long size, void *ip);
void __nvgpu_kfree(struct gk20a *g, void *addr); void nvgpu_kfree_impl(struct gk20a *g, void *addr);
void __nvgpu_vfree(struct gk20a *g, void *addr); void nvgpu_vfree_impl(struct gk20a *g, void *addr);
#endif #endif

14
drivers/gpu/nvgpu/include/nvgpu/posix/kmem.h
View File

@@ -25,13 +25,13 @@
#include <nvgpu/types.h> #include <nvgpu/types.h>
void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip); void *nvgpu_kmalloc_impl(struct gk20a *g, size_t size, void *ip);
void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip); void *nvgpu_kzalloc_impl(struct gk20a *g, size_t size, void *ip);
void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip); void *nvgpu_kcalloc_impl(struct gk20a *g, size_t n, size_t size, void *ip);
void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip); void *nvgpu_vmalloc_impl(struct gk20a *g, unsigned long size, void *ip);
void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip); void *nvgpu_vzalloc_impl(struct gk20a *g, unsigned long size, void *ip);
void __nvgpu_kfree(struct gk20a *g, void *addr); void nvgpu_kfree_impl(struct gk20a *g, void *addr);
void __nvgpu_vfree(struct gk20a *g, void *addr); void nvgpu_vfree_impl(struct gk20a *g, void *addr);
struct nvgpu_posix_fault_inj *nvgpu_kmem_get_fault_injection(void); struct nvgpu_posix_fault_inj *nvgpu_kmem_get_fault_injection(void);

6
drivers/gpu/nvgpu/libnvgpu-drv.export
View File

@@ -2,9 +2,6 @@
__bug __bug
__nvgpu_get_pte __nvgpu_get_pte
__nvgpu_kfree
__nvgpu_kmalloc
__nvgpu_kzalloc
__nvgpu_log_dbg __nvgpu_log_dbg
__nvgpu_log_msg __nvgpu_log_msg
__nvgpu_readl __nvgpu_readl
@@ -86,11 +83,14 @@ nvgpu_init_hal
nvgpu_init_mm_support nvgpu_init_mm_support
nvgpu_init_pramin nvgpu_init_pramin
nvgpu_is_enabled nvgpu_is_enabled
nvgpu_kfree_impl
nvgpu_kmalloc_impl
nvgpu_kmem_cache_alloc nvgpu_kmem_cache_alloc
nvgpu_kmem_cache_create nvgpu_kmem_cache_create
nvgpu_kmem_cache_destroy nvgpu_kmem_cache_destroy
nvgpu_kmem_cache_free nvgpu_kmem_cache_free
nvgpu_kmem_get_fault_injection nvgpu_kmem_get_fault_injection
nvgpu_kzalloc_impl
nvgpu_memset nvgpu_memset
nvgpu_mem_create_from_phys nvgpu_mem_create_from_phys
nvgpu_mem_iommu_translate nvgpu_mem_iommu_translate

16
drivers/gpu/nvgpu/os/linux/kmem.c
View File

@@ -36,7 +36,7 @@
*/ */
static atomic_t kmem_cache_id; static atomic_t kmem_cache_id;
void *__nvgpu_big_alloc(struct gk20a *g, size_t size, bool clear) void *nvgpu_big_alloc_impl(struct gk20a *g, size_t size, bool clear)
{ {
void *p; void *p;
@@ -68,7 +68,7 @@ void nvgpu_big_free(struct gk20a *g, void *p)
nvgpu_kfree(g, p); nvgpu_kfree(g, p);
} }
void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip) void *nvgpu_kmalloc_impl(struct gk20a *g, size_t size, void *ip)
{ {
void *alloc; void *alloc;
@@ -84,7 +84,7 @@ void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip)
return alloc; return alloc;
} }
void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip) void *nvgpu_kzalloc_impl(struct gk20a *g, size_t size, void *ip)
{ {
void *alloc; void *alloc;
@@ -100,7 +100,7 @@ void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip)
return alloc; return alloc;
} }
void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip) void *nvgpu_kcalloc_impl(struct gk20a *g, size_t n, size_t size, void *ip)
{ {
void *alloc; void *alloc;
@@ -116,7 +116,7 @@ void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip)
return alloc; return alloc;
} }
void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip) void *nvgpu_vmalloc_impl(struct gk20a *g, unsigned long size, void *ip)
{ {
void *alloc; void *alloc;
@@ -131,7 +131,7 @@ void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip)
return alloc; return alloc;
} }
void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip) void *nvgpu_vzalloc_impl(struct gk20a *g, unsigned long size, void *ip)
{ {
void *alloc; void *alloc;
@@ -146,7 +146,7 @@ void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip)
return alloc; return alloc;
} }
void __nvgpu_kfree(struct gk20a *g, void *addr) void nvgpu_kfree_impl(struct gk20a *g, void *addr)
{ {
kmem_dbg(g, "kfree: addr=0x%p", addr); kmem_dbg(g, "kfree: addr=0x%p", addr);
#ifdef CONFIG_NVGPU_TRACK_MEM_USAGE #ifdef CONFIG_NVGPU_TRACK_MEM_USAGE
@@ -156,7 +156,7 @@ void __nvgpu_kfree(struct gk20a *g, void *addr)
#endif #endif
} }
void __nvgpu_vfree(struct gk20a *g, void *addr) void nvgpu_vfree_impl(struct gk20a *g, void *addr)
{ {
kmem_dbg(g, "vfree: addr=0x%p", addr); kmem_dbg(g, "vfree: addr=0x%p", addr);
#ifdef CONFIG_NVGPU_TRACK_MEM_USAGE #ifdef CONFIG_NVGPU_TRACK_MEM_USAGE

24
drivers/gpu/nvgpu/os/posix/kmem.c
View File

@@ -98,7 +98,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr)
free(ptr); free(ptr);
} }
void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip) void *nvgpu_kmalloc_impl(struct gk20a *g, size_t size, void *ip)
{ {
#ifdef NVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT #ifdef NVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
if (nvgpu_posix_fault_injection_handle_call(&kmem_fi)) { if (nvgpu_posix_fault_injection_handle_call(&kmem_fi)) {
@@ -115,7 +115,7 @@ void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip)
return malloc(size); return malloc(size);
} }
void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip) void *nvgpu_kzalloc_impl(struct gk20a *g, size_t size, void *ip)
{ {
#ifdef NVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT #ifdef NVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
if (nvgpu_posix_fault_injection_handle_call(&kmem_fi)) { if (nvgpu_posix_fault_injection_handle_call(&kmem_fi)) {
@@ -125,7 +125,7 @@ void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip)
return calloc(1, size); return calloc(1, size);
} }
void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip) void *nvgpu_kcalloc_impl(struct gk20a *g, size_t n, size_t size, void *ip)
{ {
#ifdef NVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT #ifdef NVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
if (nvgpu_posix_fault_injection_handle_call(&kmem_fi)) { if (nvgpu_posix_fault_injection_handle_call(&kmem_fi)) {
@@ -135,27 +135,27 @@ void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip)
return calloc(1, n * size); return calloc(1, n * size);
} }
void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip) void *nvgpu_vmalloc_impl(struct gk20a *g, unsigned long size, void *ip)
{ {
return __nvgpu_kmalloc(g, size, ip); return nvgpu_kmalloc_impl(g, size, ip);
} }
void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip) void *nvgpu_vzalloc_impl(struct gk20a *g, unsigned long size, void *ip)
{ {
return __nvgpu_kzalloc(g, size, ip); return nvgpu_kzalloc_impl(g, size, ip);
} }
void __nvgpu_kfree(struct gk20a *g, void *addr) void nvgpu_kfree_impl(struct gk20a *g, void *addr)
{ {
free(addr); free(addr);
} }
void __nvgpu_vfree(struct gk20a *g, void *addr) void nvgpu_vfree_impl(struct gk20a *g, void *addr)
{ {
__nvgpu_kfree(g, addr); nvgpu_kfree_impl(g, addr);
} }
void *__nvgpu_big_alloc(struct gk20a *g, size_t size, bool clear) void *nvgpu_big_alloc_impl(struct gk20a *g, size_t size, bool clear)
{ {
if (clear) { if (clear) {
return nvgpu_kzalloc(g, size); return nvgpu_kzalloc(g, size);
@@ -166,7 +166,7 @@ void *__nvgpu_big_alloc(struct gk20a *g, size_t size, bool clear)
void nvgpu_big_free(struct gk20a *g, void *p) void nvgpu_big_free(struct gk20a *g, void *p)
{ {
__nvgpu_kfree(g, p); nvgpu_kfree_impl(g, p);
} }
int nvgpu_kmem_init(struct gk20a *g) int nvgpu_kmem_init(struct gk20a *g)