From: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
To: dev@dpdk.org
Cc: Felix Marti <felix@chelsio.com>,
Kumar Sanghvi <kumaras@chelsio.com>,
Nirranjan Kirubaharan <nirranjan@chelsio.com>
Subject: [PATCH v2] vfio: Fix overflow while assigning vfio BAR region offset and size
Date: Tue, 23 Jun 2015 20:30:53 +0530 [thread overview]
Message-ID: <2eeeff646a329cca169033f541de3e96cec3a27a.1435067129.git.rahul.lakkireddy@chelsio.com> (raw)
In-Reply-To: <61d1c9174f7f9159d4005dd2cea16c7719cec964.1434462470.git.rahul.lakkireddy@chelsio.com>
When using vfio, the probe fails over Chelsio T5 adapters after
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 (i.e. trying to overwrite previously allocated BAR 0
region).
The fix is to use these region offset and size directly rather than assigning
to uint32_t variables.
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>
---
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 | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
index 426953a..ff974f5 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
@@ -775,9 +775,6 @@ pci_vfio_map_resource(struct rte_pci_device *dev)
memreg[0].offset, memreg[0].size,
memreg[1].offset, memreg[1].size);
}
- } else {
- memreg[0].offset = reg.offset;
- memreg[0].size = reg.size;
}
/* try to figure out an address */
@@ -815,6 +812,15 @@ pci_vfio_map_resource(struct rte_pci_device *dev)
MAP_FIXED);
}
+ if (!map_addr) {
+ /* Not a BAR containing MSI-X */
+ map_addr = pci_map_resource(bar_addr,
+ vfio_dev_fd,
+ reg.offset,
+ reg.size,
+ MAP_FIXED);
+ }
+
if (map_addr == MAP_FAILED || !map_addr) {
munmap(bar_addr, reg.size);
bar_addr = MAP_FAILED;
--
2.4.1
next prev parent reply other threads:[~2015-06-23 15:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 14:16 [PATCH] vfio: Fix overflow while assigning vfio BAR region offset and size Rahul Lakkireddy
2015-06-17 12:09 ` Thomas Monjalon
2015-06-18 14:23 ` Rahul Lakkireddy
2015-06-23 15:00 ` Rahul Lakkireddy [this message]
2015-06-30 21:12 ` [PATCH v2] " Thomas Monjalon
2015-07-01 8:34 ` Alejandro Lucero
2015-07-01 10:00 ` Burakov, Anatoly
2015-07-06 15:45 ` Alejandro Lucero
2015-07-07 7:56 ` Rahul Lakkireddy
2015-07-07 9:08 ` Burakov, Anatoly
2015-07-07 10:40 ` Rahul Lakkireddy
2015-07-07 10:50 ` Burakov, Anatoly
2015-07-10 9:54 ` Rahul Lakkireddy
2015-07-10 17:27 ` Alejandro Lucero
2015-07-13 8:51 ` [PATCH v3] " Rahul Lakkireddy
2015-07-14 8:56 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2eeeff646a329cca169033f541de3e96cec3a27a.1435067129.git.rahul.lakkireddy@chelsio.com \
--to=rahul.lakkireddy@chelsio.com \
--cc=dev@dpdk.org \
--cc=felix@chelsio.com \
--cc=kumaras@chelsio.com \
--cc=nirranjan@chelsio.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.