From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EB759A0A02 for ; Mon, 17 May 2021 18:15:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E23C840041; Mon, 17 May 2021 18:15:19 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id A547840041 for ; Mon, 17 May 2021 18:15:18 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifti-0008BS-5y; Mon, 17 May 2021 16:15:14 +0000 From: Christian Ehrhardt To: Yunjian Wang Cc: Kevin Traynor , Anatoly Burakov , dpdk stable Date: Mon, 17 May 2021 18:09:09 +0200 Message-Id: <20210517161039.3132619-120-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vfio: fix duplicated user mem map' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f6a20c5729acd0af11439db136110c0f901d75ac Thanks. Christian Ehrhardt --- >From f6a20c5729acd0af11439db136110c0f901d75ac Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 10 Apr 2021 17:37:57 +0800 Subject: [PATCH] vfio: fix duplicated user mem map [ upstream commit 22677b0eef49ec30ef0facadee44b0084fc091ac ] 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 didn'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") Suggested-by: Kevin Traynor Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov --- lib/librte_eal/linux/eal/eal_vfio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c index 25992ae92f..cb7de6f810 100644 --- a/lib/librte_eal/linux/eal/eal_vfio.c +++ b/lib/librte_eal/linux/eal/eal_vfio.c @@ -170,6 +170,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) @@ -177,6 +181,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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.136576110 +0200 +++ 0120-vfio-fix-duplicated-user-mem-map.patch 2021-05-17 17:40:29.347810863 +0200 @@ -1 +1 @@ -From 22677b0eef49ec30ef0facadee44b0084fc091ac Mon Sep 17 00:00:00 2001 +From f6a20c5729acd0af11439db136110c0f901d75ac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22677b0eef49ec30ef0facadee44b0084fc091ac ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - lib/librte_eal/linux/eal_vfio.c | 5 +++++ + lib/librte_eal/linux/eal/eal_vfio.c | 5 +++++ @@ -27,5 +28,5 @@ -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, +diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c +index 25992ae92f..cb7de6f810 100644 +--- a/lib/librte_eal/linux/eal/eal_vfio.c ++++ b/lib/librte_eal/linux/eal/eal_vfio.c +@@ -170,6 +170,10 @@ adjust_map(struct user_mem_map *src, struct user_mem_map *end, @@ -42 +43 @@ -@@ -178,6 +182,7 @@ merge_map(struct user_mem_map *left, struct user_mem_map *right) +@@ -177,6 +181,7 @@ merge_map(struct user_mem_map *left, struct user_mem_map *right)