From 0f9ac2afa62ebacd24f36a3b98272b7146be3edd Mon Sep 17 00:00:00 2001 From: Sarosh Arif Date: Thu, 24 Sep 2020 15:39:32 +0500 Subject: [PATCH] common/octeontx2: fix memory mapping API usage Replace mmap() and munmap() APIs with EAL abstraction for the same. Fixes: e1d9a02ad8f0 ("common/octeontx2: introduce common device class") Cc: stable@dpdk.org Signed-off-by: Sarosh Arif Acked-by: Jerin Jacob --- drivers/common/octeontx2/otx2_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/common/octeontx2/otx2_dev.c b/drivers/common/octeontx2/otx2_dev.c index d61c712faf..6a84df2344 100644 --- a/drivers/common/octeontx2/otx2_dev.c +++ b/drivers/common/octeontx2/otx2_dev.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "otx2_dev.h" #include "otx2_mbox.h" @@ -34,10 +35,11 @@ mbox_mem_map(off_t off, size_t size) if (mem_fd < 0) goto error; - va = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, mem_fd, off); + va = rte_mem_map(NULL, size, RTE_PROT_READ | RTE_PROT_WRITE, + RTE_MAP_SHARED, mem_fd, off); close(mem_fd); - if (va == MAP_FAILED) + if (va == NULL) otx2_err("Failed to mmap sz=0x%zx, fd=%d, off=%jd", size, mem_fd, (intmax_t)off); error: @@ -48,7 +50,7 @@ static void mbox_mem_unmap(void *va, size_t size) { if (va) - munmap(va, size); + rte_mem_unmap(va, size); } static int