dpdk: conditionally revert rte_vfio_dma_map patch

DPDK have bug which will be fixed in 19.11.

Type: fix
Change-Id: I6c0058928e5991d61b3c5fcba706f35e6886b0f2
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2019-11-06 15:40:21 +01:00
committed by Florin Coras
parent 6b0dd55024
commit 4d11b6ceca

View File

@ -20,6 +20,7 @@
#include <rte_mbuf.h>
#include <rte_ethdev.h>
#include <rte_vfio.h>
#include <rte_version.h>
#include <vlib/vlib.h>
#include <dpdk/buffer.h>
@ -150,8 +151,12 @@ dpdk_buffer_pool_init (vlib_main_t * vm, vlib_buffer_pool_t * bp)
pointer_to_uword (va) : pm->page_table[i];
if (do_vfio_map &&
#if RTE_VERSION < RTE_VERSION_NUM(19, 11, 0, 0)
rte_vfio_dma_map (pointer_to_uword (va), pa, page_sz))
#else
rte_vfio_container_dma_map (RTE_VFIO_DEFAULT_CONTAINER_FD,
pointer_to_uword (va), pa, page_sz))
#endif
do_vfio_map = 0;
struct rte_mempool_memhdr *memhdr;