X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fdpdk%2Finit.c;fp=vnet%2Fvnet%2Fdevices%2Fdpdk%2Finit.c;h=01bd27db35d14dacd53c15224be0ce69dbc3370a;hb=3b906b0d9b93a892831ce4d54d1d7ec3956ce2b4;hp=c57fcde3543e8a2850b47471b88eeb9748121184;hpb=a0bc391daf1ded0c0d512cade822675d2bd32a36;p=vpp.git diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index c57fcde3543..01bd27db35d 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -1707,10 +1707,15 @@ dpdk_init (vlib_main_t * vm) vlib_thread_main_t *tm = vlib_get_thread_main (); /* verify that structs are cacheline aligned */ - ASSERT (offsetof (dpdk_device_t, cacheline0) == 0); - ASSERT (offsetof (dpdk_device_t, cacheline1) == CLIB_CACHE_LINE_BYTES); - ASSERT (offsetof (dpdk_worker_t, cacheline0) == 0); - ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0); + STATIC_ASSERT (offsetof (dpdk_device_t, cacheline0) == 0, + "Cache line marker must be 1st element in dpdk_device_t"); + STATIC_ASSERT (offsetof (dpdk_device_t, cacheline1) == + CLIB_CACHE_LINE_BYTES, + "Data in cache line 0 is bigger than cache line size"); + STATIC_ASSERT (offsetof (dpdk_worker_t, cacheline0) == 0, + "Cache line marker must be 1st element in dpdk_worker_t"); + STATIC_ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0, + "Cache line marker must be 1st element in frame_queue_trace_t"); dm->vlib_main = vm; dm->vnet_main = vnet_get_main ();