From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 447DEA0579;
Sat, 10 Apr 2021 11:38:21 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id C80251411D7;
Sat, 10 Apr 2021 11:38:20 +0200 (CEST)
Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191])
by mails.dpdk.org (Postfix) with ESMTP id 3D4B91411D6;
Sat, 10 Apr 2021 11:38:18 +0200 (CEST)
Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.60])
by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FHVHR12j8zqSVQ;
Sat, 10 Apr 2021 17:36:03 +0800 (CST)
Received: from localhost (10.174.242.151) by DGGEMS402-HUB.china.huawei.com
(10.3.19.202) with Microsoft SMTP Server id 14.3.498.0; Sat, 10 Apr 2021
17:38:05 +0800
From: wangyunjian <wangyunjian@huawei.com>
To: <dev@dpdk.org>
CC: <david.marchand@redhat.com>, <thomas@monjalon.net>,
<anatoly.burakov@intel.com>, <ktraynor@redhat.com>,
<dingxiaoxiong@huawei.com>, Yunjian Wang <wangyunjian@huawei.com>,
<stable@dpdk.org>
Date: Sat, 10 Apr 2021 17:37:57 +0800
Message-ID: <1618047477-22368-1-git-send-email-wangyunjian@huawei.com>
X-Mailer: git-send-email 1.9.5.msysgit.1
In-Reply-To: <1602840525-8848-1-git-send-email-wangyunjian@huawei.com>
References: <1602840525-8848-1-git-send-email-wangyunjian@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.174.242.151]
X-CFilter-Loop: Reflected
Subject: [dpdk-dev] [PATCH v5] eal: fix create user mem map repeatedly when
it exists
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Yunjian Wang <wangyunjian@huawei.com>
Currently, new user mem maps are checked if they are adjacent to
an existing mem map and if so, the mem map entries are merged.
It doesn't check for duplicate mem maps, so if the API is called
with the same mem map multiple times, they will occupy multiple
mem map entries. This will reduce the amount of entries available
for unique mem maps.
So check for duplicate mem maps and merge them into one mem map
entry if any found.
Fixes: 0cbce3a167f1 ("vfio: skip DMA map failure if already mapped")
Cc: stable@dpdk.org
Suggested-by: Kevin Traynor <ktraynor@redhat.com>
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
v5:
Update commit log suggested by Kevin Traynor
---
lib/librte_eal/linux/eal_vfio.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c
index fe25719991..25add2fa5d 100644
--- a/lib/librte_eal/linux/eal_vfio.c
+++ b/lib/librte_eal/linux/eal_vfio.c
@@ -171,6 +171,10 @@ adjust_map(struct user_mem_map *src, struct user_mem_map *end,
static int
merge_map(struct user_mem_map *left, struct user_mem_map *right)
{
+ /* merge the same maps into one */
+ if (memcmp(left, right, sizeof(struct user_mem_map)) == 0)
+ goto out;
+
if (left->addr + left->len != right->addr)
return 0;
if (left->iova + left->len != right->iova)
@@ -178,6 +182,7 @@ merge_map(struct user_mem_map *left, struct user_mem_map *right)
left->len += right->len;
+out:
memset(right, 0, sizeof(*right));
return 1;
--
2.23.0