From: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
To: dev@dpdk.org
Cc: reshma.pattan@intel.com, jananeex.m.parthasarathy@intel.com,
anatoly.burakov@intel.com,
Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH v2 1/3] lib/eal: fix vfio unmap that fails unexpectedly
Date: Thu, 22 Aug 2019 12:53:54 +0100 [thread overview]
Message-ID: <1566474836-30480-2-git-send-email-tallurix.chaitanya.babu@intel.com> (raw)
In-Reply-To: <1566392575-7965-1-git-send-email-tallurix.chaitanya.babu@intel.com>
Unmap fails when there are duplicate entries in user_mem_maps.
The fix is to validate if the input VA, IOVA exists or
overlaps in user_mem_maps before creating map.
Fixes: 73a63908 ("vfio: allow to map other memory regions")
Cc: stable@dpdk.org
Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
---
lib/librte_eal/linux/eal/eal_vfio.c | 46 +++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
index 501c74f23..104912077 100644
--- a/lib/librte_eal/linux/eal/eal_vfio.c
+++ b/lib/librte_eal/linux/eal/eal_vfio.c
@@ -212,6 +212,41 @@ find_user_mem_map(struct user_mem_maps *user_mem_maps, uint64_t addr,
return NULL;
}
+static int
+find_user_mem_map_overlap(struct user_mem_maps *user_mem_maps, uint64_t addr,
+ uint64_t iova, uint64_t len)
+{
+ uint64_t va_end = addr + len;
+ uint64_t iova_end = iova + len;
+ int i;
+
+ for (i = 0; i < user_mem_maps->n_maps; i++) {
+ struct user_mem_map *map = &user_mem_maps->maps[i];
+ uint64_t map_va_end = map->addr + map->len;
+ uint64_t map_iova_end = map->iova + map->len;
+
+ bool no_lo_va_overlap = addr < map->addr && va_end <= map->addr;
+ bool no_hi_va_overlap = addr >= map_va_end &&
+ va_end > map_va_end;
+ bool no_lo_iova_overlap = iova < map->iova &&
+ iova_end <= map->iova;
+ bool no_hi_iova_overlap = iova >= map_iova_end &&
+ iova_end > map_iova_end;
+
+ /* check input VA and iova is not within the
+ * existing map's range
+ */
+ if ((no_lo_va_overlap || no_hi_va_overlap) &&
+ (no_lo_iova_overlap || no_hi_iova_overlap))
+ continue;
+ else
+ /* map overlaps */
+ return 1;
+ }
+ /* map doesn't overlap */
+ return 0;
+}
+
/* this will sort all user maps, and merge/compact any adjacent maps */
static void
compact_user_maps(struct user_mem_maps *user_mem_maps)
@@ -1732,6 +1767,17 @@ container_dma_map(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
ret = -1;
goto out;
}
+
+ /* check whether vaddr and iova exists in user_mem_maps */
+ ret = find_user_mem_map_overlap(user_mem_maps, vaddr, iova, len);
+ if (ret) {
+ RTE_LOG(ERR, EAL, "Mapping overlaps with a previously "
+ "existing mapping\n");
+ rte_errno = EEXIST;
+ ret = -1;
+ goto out;
+ }
+
/* map the entry */
if (vfio_dma_mem_map(vfio_cfg, vaddr, iova, len, 1)) {
/* technically, this will fail if there are currently no devices
--
2.17.2
next prev parent reply other threads:[~2019-08-22 11:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1566392575-7965-1-git-send-email-tallurix.chaitanya.babu@intel.com>
2019-08-21 13:02 ` [dpdk-stable] [PATCH " Chaitanya Babu Talluri
2019-08-21 13:20 ` Burakov, Anatoly
2019-08-21 13:02 ` [dpdk-stable] [PATCH 2/3] lib/eal: fix vfio unmap that succeeds unexpectedly Chaitanya Babu Talluri
2019-08-21 13:24 ` Burakov, Anatoly
2019-08-22 11:53 ` Chaitanya Babu Talluri [this message]
2019-08-22 11:53 ` [dpdk-stable] [PATCH v2 " Chaitanya Babu Talluri
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=1566474836-30480-2-git-send-email-tallurix.chaitanya.babu@intel.com \
--to=tallurix.chaitanya.babu@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=dev@dpdk.org \
--cc=jananeex.m.parthasarathy@intel.com \
--cc=reshma.pattan@intel.com \
--cc=stable@dpdk.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).