[dpdk-dev,v3] vfio: Fix overflow while assigning vfio BAR region offset and size
Commit Message
When using vfio, the probe fails for BAR > 0 after the
commit-id 90a1633b2 (eal/linux: allow to map BARs with MSI-X tables).
While debugging further, found that the BAR region offset and size read from
vfio are u64, but are assigned to uint32_t variables. This results in the u64
value getting truncated to 0 and passing wrong offset and size to mmap for
subsequent BAR regions.
The fix is to use unsigned long for the offset and size.
This is based on patch by Alejandro Lucero <alejandro.lucero@netronome.com>
posted at below:
http://dpdk.org/ml/archives/dev/2015-June/020201.html
and updated with diff from below to fix 32-bit compilation:
http://dpdk.org/ml/archives/dev/2015-July/020963.html
Fixes: 90a1633b2347 ("eal/linux: allow to map BARs with MSI-X tables")
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
---
v3:
- Use unsigned long instead and updated the commit log.
v2:
- For fixing 32-bit build failure, rather than converting uint32_t var to uint64_t
as done in v1, taking a different approach instead to revert a part of above
commit-id so as to use the original region offset and size directly.
- Add the commit-id that this patch fixes and update commit log.
lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
2015-07-13 14:21, Rahul Lakkireddy:
> When using vfio, the probe fails for BAR > 0 after the
> commit-id 90a1633b2 (eal/linux: allow to map BARs with MSI-X tables).
>
> While debugging further, found that the BAR region offset and size read from
> vfio are u64, but are assigned to uint32_t variables. This results in the u64
> value getting truncated to 0 and passing wrong offset and size to mmap for
> subsequent BAR regions.
>
> The fix is to use unsigned long for the offset and size.
>
> This is based on patch by Alejandro Lucero <alejandro.lucero@netronome.com>
> posted at below:
>
> http://dpdk.org/ml/archives/dev/2015-June/020201.html
>
> and updated with diff from below to fix 32-bit compilation:
>
> http://dpdk.org/ml/archives/dev/2015-July/020963.html
>
> Fixes: 90a1633b2347 ("eal/linux: allow to map BARs with MSI-X tables")
> Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
> Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
Applied, thanks
@@ -728,7 +728,7 @@ pci_vfio_map_resource(struct rte_pci_device *dev)
struct vfio_region_info reg = { .argsz = sizeof(reg) };
void *bar_addr;
struct memreg {
- uint32_t offset, size;
+ unsigned long offset, size;
} memreg[2] = {};
reg.index = i;
@@ -771,7 +771,7 @@ pci_vfio_map_resource(struct rte_pci_device *dev)
RTE_LOG(DEBUG, EAL,
"Trying to map BAR %d that contains the MSI-X "
"table. Trying offsets: "
- "%04x:%04x, %04x:%04x\n", i,
+ "0x%04lx:0x%04lx, 0x%04lx:0x%04lx\n", i,
memreg[0].offset, memreg[0].size,
memreg[1].offset, memreg[1].size);
}