drivers/common/octeontx2: use generic memory management
Checks
Commit Message
Use generic memory management calls instead of Unix memory management
calls for mempool.
Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com>
---
drivers/common/octeontx2/otx2_dev.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Comments
Comments inline.
>-----Original Message-----
>From: dev <dev-bounces@dpdk.org> On Behalf Of Sarosh Arif
>Sent: Monday, July 13, 2020 6:31 PM
>To: Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Nithin Kumar
>Dabilpuram <ndabilpuram@marvell.com>
>Cc: dev@dpdk.org; Sarosh Arif <sarosh.arif@emumba.com>
>Subject: [dpdk-dev] [PATCH] drivers/common/octeontx2: use generic memory
>management
>
Change subject line to "common/ octeontx2: fix memory mapping API's usage"
>Use generic memory management calls instead of Unix memory management
>calls for mempool.
>
IMO, generic memory management calls implies to Unix calls. Better to update the comment
accordingly.
Also please add fixes tag.
>Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com>
>---
> 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 d61c712fa..06ff41b59 100644
>--- a/drivers/common/octeontx2/otx2_dev.c
>+++ b/drivers/common/octeontx2/otx2_dev.c
>@@ -11,6 +11,7 @@
> #include <rte_common.h>
> #include <rte_eal.h>
> #include <rte_memcpy.h>
>+#include <rte_eal_paging.h>
>
> #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
>--
>2.17.1
@@ -11,6 +11,7 @@
#include <rte_common.h>
#include <rte_eal.h>
#include <rte_memcpy.h>
+#include <rte_eal_paging.h>
#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