Skip to content

Commit

Permalink
eal: fix memory mapping on 32-bit target
Browse files Browse the repository at this point in the history
[ upstream commit 6beb2d2 ]

For 32-bit targets, size_t is normally a 32-bit type and
does not have sufficient range to represent 64-bit offsets
that are needed when mapping PCI addresses.
Use uint64_t instead.

Found when attempting to run 32-bit Linux dpdk-testpmd
using VFIO driver:

    EAL: pci_map_resource(): cannot map resource(63, 0xc0010000, \
    0x200000, 0x20000000000): Invalid argument ((nil))

Fixes: c4b89ec ("eal: introduce memory management wrappers")

Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
  • Loading branch information
Lance Richardson authored and steevenlee committed Jun 8, 2021
1 parent 3cb6827 commit 3aadd33
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/librte_eal/include/rte_eal_paging.h
Expand Up @@ -61,7 +61,7 @@ enum rte_map_flags {
__rte_internal
void *
rte_mem_map(void *requested_addr, size_t size, int prot, int flags,
int fd, size_t offset);
int fd, uint64_t offset);

/**
* OS-independent implementation of POSIX munmap(3).
Expand Down
11 changes: 6 additions & 5 deletions lib/librte_eal/unix/eal_unix_memory.c
Expand Up @@ -5,6 +5,7 @@
#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
#include <inttypes.h>

#include <rte_eal_paging.h>
#include <rte_errno.h>
Expand All @@ -24,14 +25,14 @@

static void *
mem_map(void *requested_addr, size_t size, int prot, int flags,
int fd, size_t offset)
int fd, uint64_t offset)
{
void *virt = mmap(requested_addr, size, prot, flags, fd, offset);
if (virt == MAP_FAILED) {
RTE_LOG(DEBUG, EAL,
"Cannot mmap(%p, 0x%zx, 0x%x, 0x%x, %d, 0x%zx): %s\n",
requested_addr, size, prot, flags, fd, offset,
strerror(errno));
"Cannot mmap(%p, 0x%zx, 0x%x, 0x%x, %d, 0x%"PRIx64"): %s\n",
requested_addr, size, prot, flags, fd, offset,
strerror(errno));
rte_errno = errno;
return NULL;
}
Expand Down Expand Up @@ -106,7 +107,7 @@ mem_rte_to_sys_prot(int prot)

void *
rte_mem_map(void *requested_addr, size_t size, int prot, int flags,
int fd, size_t offset)
int fd, uint64_t offset)
{
int sys_flags = 0;
int sys_prot;
Expand Down
2 changes: 1 addition & 1 deletion lib/librte_eal/windows/eal_memory.c
Expand Up @@ -508,7 +508,7 @@ eal_mem_set_dump(void *virt, size_t size, bool dump)

void *
rte_mem_map(void *requested_addr, size_t size, int prot, int flags,
int fd, size_t offset)
int fd, uint64_t offset)
{
HANDLE file_handle = INVALID_HANDLE_VALUE;
HANDLE mapping_handle = INVALID_HANDLE_VALUE;
Expand Down

0 comments on commit 3aadd33

Please sign in to comment.