d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: fix memory mapping on 32-bit target

Browse Source 
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: c4b89ecb64ea ("eal: introduce memory management wrappers")
Cc: stable@dpdk.org

Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
This commit is contained in:
Lance Richardson 2021-05-08 10:27:53 -04:00 committed by Thomas Monjalon
parent 86ff066363
commit 6beb2d2947
3 changed files with 8 additions and 7 deletions

2
lib/eal/include/rte_eal_paging.h

@ -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).

11
lib/eal/unix/eal_unix_memory.c

@ -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>
@ -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;
}
@ -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;

2
lib/eal/windows/eal_memory.c

@ -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;