diff options
Diffstat (limited to 'src/vlib')
| -rw-r--r-- | src/vlib/buffer_node.h | 6 | ||||
| -rwxr-xr-x | src/vlib/physmem.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/vlib/buffer_node.h b/src/vlib/buffer_node.h index 96b50ae3551..bd82b1037a9 100644 --- a/src/vlib/buffer_node.h +++ b/src/vlib/buffer_node.h @@ -350,17 +350,17 @@ vlib_buffer_enqueue_to_next (vlib_main_t * vm, vlib_node_runtime_t * node, max = clib_min (n_left_to_next, count); } #if defined(CLIB_HAVE_VEC512) - u16x32 next32 = u16x32_load_unaligned (nexts); + u16x32 next32 = CLIB_MEM_OVERFLOW_LOAD (u16x32_load_unaligned, nexts); next32 = (next32 == u16x32_splat (next32[0])); u64 bitmap = u16x32_msb_mask (next32); n_enqueued = count_trailing_zeros (~bitmap); #elif defined(CLIB_HAVE_VEC256) - u16x16 next16 = u16x16_load_unaligned (nexts); + u16x16 next16 = CLIB_MEM_OVERFLOW_LOAD (u16x16_load_unaligned, nexts); next16 = (next16 == u16x16_splat (next16[0])); u64 bitmap = u8x32_msb_mask ((u8x32) next16); n_enqueued = count_trailing_zeros (~bitmap) / 2; #elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_MSB_MASK) - u16x8 next8 = u16x8_load_unaligned (nexts); + u16x8 next8 = CLIB_MEM_OVERFLOW_LOAD (u16x8_load_unaligned, nexts); next8 = (next8 == u16x8_splat (next8[0])); u64 bitmap = u8x16_msb_mask ((u8x16) next8); n_enqueued = count_trailing_zeros (~bitmap) / 2; diff --git a/src/vlib/physmem.c b/src/vlib/physmem.c index a62309552f5..40346fc2f70 100755 --- a/src/vlib/physmem.c +++ b/src/vlib/physmem.c @@ -29,7 +29,7 @@ #include <vlib/pci/pci.h> #include <vlib/linux/vfio.h> -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(CLIB_SANITIZE_ADDR) /* we keep physmem in low 38 bits of VA address space as some IOMMU implamentation cannot map above that range */ #define VLIB_PHYSMEM_DEFAULT_BASE_ADDDR (1ULL << 36) |