ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vppinfra: fix coverity warnings

Browse Source 
Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I654747d618cc4fe99b7774827303769fe43392ed
This commit is contained in:
Dave Barach
2020-10-07 09:37:36 -04:00
committed by Damjan Marion
parent 6e366be38f
commit 27c35e3056
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vppinfra/linux/mem.c
View File

@ -374,7 +374,7 @@ clib_mem_vm_map_hdr_t *
clib_mem_vm_get_next_map_hdr (clib_mem_vm_map_hdr_t * hdr)
{
clib_mem_main_t *mm = &clib_mem_main;
uword sys_page_sz = 1 << mm->log2_page_sz;
uword sys_page_sz = 1ULL << mm->log2_page_sz;
clib_mem_vm_map_hdr_t *next;
if (hdr == 0)
{
@ -396,7 +396,7 @@ clib_mem_vm_map_internal (void *base, clib_mem_page_sz_t log2_page_sz,
{
clib_mem_main_t *mm = &clib_mem_main;
clib_mem_vm_map_hdr_t *hdr;
uword sys_page_sz = 1 << mm->log2_page_sz;
uword sys_page_sz = 1ULL << mm->log2_page_sz;
int mmap_flags = MAP_FIXED, is_huge = 0;
if (fd != -1)
@ -436,7 +436,7 @@ clib_mem_vm_map_internal (void *base, clib_mem_page_sz_t log2_page_sz,
if (log2_page_sz == CLIB_MEM_PAGE_SZ_UNKNOWN)
return CLIB_MEM_VM_MAP_FAILED;
size = round_pow2 (size, 1 << log2_page_sz);
size = round_pow2 (size, 1ULL << log2_page_sz);
base = (void *) clib_mem_vm_reserve ((uword) base, size, log2_page_sz);
@ -492,7 +492,7 @@ int
clib_mem_vm_unmap (void *base)
{
clib_mem_main_t *mm = &clib_mem_main;
uword size, sys_page_sz = 1 << mm->log2_page_sz;
uword size, sys_page_sz = 1ULL << mm->log2_page_sz;
clib_mem_vm_map_hdr_t *hdr = base - sys_page_sz;;
if (mprotect (hdr, sys_page_sz, PROT_READ | PROT_WRITE) != 0)

2
src/vppinfra/mem.h
View File

@ -543,7 +543,7 @@ clib_mem_log2_page_size_validate (clib_mem_page_sz_t log2_page_size)
static_always_inline uword
clib_mem_page_bytes (clib_mem_page_sz_t log2_page_size)
{
return 1 << clib_mem_log2_page_size_validate (log2_page_size);
return 1ULL << clib_mem_log2_page_size_validate (log2_page_size);
}
static_always_inline clib_error_t *