diff options
| author |   Lijian.Zhang <Lijian.Zhang@arm.com> | 2019-08-21 17:51:16 +0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-09-03 15:55:40 +0000 |
| commit | ba0da570f264785f6b50eff7829f6653c0924069 (patch) | |
| tree | 086908ccf181fd345ebaee7c1d92fb6685c83ed7 | |
| parent | 017dc45243bad1b3708d0a9b902d23ca47859344 (diff) | |
tap: fix tap interface not working on Arm issue
The VPP code tries to set all userspace memory in the table via IOCTL
to VHOST_SET_MEM_TABLE. But on aarch64, the userspace address range is
larger (48 bits) than that on x86 (47 bits). Below is an segment from
/proc/[vpp]/maps.
fffb41200000-fffb43a00000 rw-s 00000000 00:0e 532232
/anon_hugepage (deleted)
Instead of setting all userspace memory space to vhost-net, will only set
the address space reserved by pmalloc module during initialization.
Type: fix
Change-Id: I91cb35e990869b42094cf2cd0512593733d33677
Signed-off-by: Lijian Zhang <Lijian.Zhang@arm.com>
Reviewed-by: Steve Capper <Steve.Capper@arm.com>
| -rwxr-xr-x | src/vlib/physmem.c | 7 | ||||
| -rw-r--r-- | src/vlib/physmem.h | 1 | ||||
| -rw-r--r-- | src/vnet/devices/tap/tap.c | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/vlib/physmem.c b/src/vlib/physmem.c index 64920e1ebe2..a62309552f5 100755 --- a/src/vlib/physmem.c +++ b/src/vlib/physmem.c @@ -115,7 +115,12 @@ vlib_physmem_init (vlib_main_t * vm) if (vpm->base_addr == 0) vpm->base_addr = VLIB_PHYSMEM_DEFAULT_BASE_ADDDR; - clib_pmalloc_init (vpm->pmalloc_main, vpm->base_addr, 0); + clib_pmalloc_init (vpm->pmalloc_main, vpm->base_addr, vpm->max_size); + + /* update base_addr and max_size per actual allocation */ + vpm->base_addr = (uword) vpm->pmalloc_main->base; + vpm->max_size = (uword) vpm->pmalloc_main->max_pages << + vpm->pmalloc_main->def_log2_page_sz; return error; } diff --git a/src/vlib/physmem.h b/src/vlib/physmem.h index 7b7a3af3dfa..de79da51ad0 100644 --- a/src/vlib/physmem.h +++ b/src/vlib/physmem.h @@ -57,6 +57,7 @@ typedef struct { u32 flags; uword base_addr; + uword max_size; #define VLIB_PHYSMEM_MAIN_F_HAVE_PAGEMAP (1 << 0) #define VLIB_PHYSMEM_MAIN_F_HAVE_IOMMU (1 << 1) vlib_physmem_map_t *maps; diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index 0d7916d7ee2..917bd10644c 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -31,6 +31,7 @@ #include <linux/rtnetlink.h> #include <vlib/vlib.h> +#include <vlib/physmem.h> #include <vlib/unix/unix.h> #include <vnet/ethernet/ethernet.h> #include <vnet/ip/ip4_packet.h> @@ -112,6 +113,7 @@ open_netns_fd (char *netns) void tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) { + vlib_physmem_main_t *vpm = &vm->physmem_main; vnet_main_t *vnm = vnet_get_main (); virtio_main_t *vim = &virtio_main; tap_main_t *tm = &tap_main; @@ -391,7 +393,10 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) vhost_mem = clib_mem_alloc (i); clib_memset (vhost_mem, 0, i); vhost_mem->nregions = 1; - vhost_mem->regions[0].memory_size = (1ULL << 47) - 4096; + vhost_mem->regions[0].memory_size = vpm->max_size; + vhost_mem->regions[0].guest_phys_addr = vpm->base_addr; + vhost_mem->regions[0].userspace_addr = + vhost_mem->regions[0].guest_phys_addr; _IOCTL (vif->fd, VHOST_SET_MEM_TABLE, vhost_mem); if ((args->error = |