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 6F133A0A02 for ; Mon, 17 May 2021 18:10:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 352ED40041; Mon, 17 May 2021 18:10:49 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2A9BC40041 for ; Mon, 17 May 2021 18:10:48 +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 1lifpN-0007VZ-21; Mon, 17 May 2021 16:10:45 +0000 From: Christian Ehrhardt To: Nithin Dabilpuram Cc: Anatoly Burakov , David Christensen , dpdk stable Date: Mon, 17 May 2021 18:07:10 +0200 Message-Id: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vfio: do not merge contiguous areas' 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/b92fd56073afacb5ba3a31c42a5526b96399ff74 Thanks. Christian Ehrhardt --- >From b92fd56073afacb5ba3a31c42a5526b96399ff74 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Fri, 15 Jan 2021 13:02:41 +0530 Subject: [PATCH] vfio: do not merge contiguous areas [ upstream commit 016763c219580292c8b05059c7452a7a11d0d19e ] In order to save DMA entries limited by kernel both for external memory and hugepage memory, an attempt was made to map physically contiguous memory in one go. This cannot be done as VFIO IOMMU type1 does not support partially unmapping a previously mapped memory region while Heap can request for multi page mapping and partial unmapping. Hence for going back to old method of mapping/unmapping at memseg granularity, this commit reverts commit d1c7c0cdf7ba ("vfio: map contiguous areas in one go") Also add documentation on what module parameter needs to be used to increase the per-container dma map limit for VFIO. Fixes: d1c7c0cdf7ba ("vfio: map contiguous areas in one go") Signed-off-by: Nithin Dabilpuram Acked-by: Anatoly Burakov Acked-by: David Christensen --- doc/guides/linux_gsg/linux_drivers.rst | 10 +++++ lib/librte_eal/linux/eal/eal_vfio.c | 59 ++++---------------------- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst index 96817e78cd..d8e5ad711a 100644 --- a/doc/guides/linux_gsg/linux_drivers.rst +++ b/doc/guides/linux_gsg/linux_drivers.rst @@ -72,6 +72,16 @@ Note that in order to use VFIO, your kernel must support it. VFIO kernel modules have been included in the Linux kernel since version 3.6.0 and are usually present by default, however please consult your distributions documentation to make sure that is the case. +For DMA mapping of either external memory or hugepages, VFIO interface is used. +VFIO does not support partial unmap of once mapped memory. Hence DPDK's memory is +mapped in hugepage granularity or system page granularity. Number of DMA +mappings is limited by kernel with user locked memory limit of a process (rlimit) +for system/hugepage memory. Another per-container overall limit applicable both +for external memory and system memory was added in kernel 5.1 defined by +VFIO module parameter ``dma_entry_limit`` with a default value of 64K. +When application is out of DMA entries, these limits need to be adjusted to +increase the allowed limit. + Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). .. note:: diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c index 1be02e7f13..5e6101d9a9 100644 --- a/lib/librte_eal/linux/eal/eal_vfio.c +++ b/lib/librte_eal/linux/eal/eal_vfio.c @@ -514,11 +514,9 @@ static void vfio_mem_event_callback(enum rte_mem_event type, const void *addr, size_t len, void *arg __rte_unused) { - rte_iova_t iova_start, iova_expected; struct rte_memseg_list *msl; struct rte_memseg *ms; size_t cur_len = 0; - uint64_t va_start; msl = rte_mem_virt2memseg_list(addr); @@ -547,63 +545,22 @@ vfio_mem_event_callback(enum rte_mem_event type, const void *addr, size_t len, #endif /* memsegs are contiguous in memory */ ms = rte_mem_virt2memseg(addr, msl); - - /* - * This memory is not guaranteed to be contiguous, but it still could - * be, or it could have some small contiguous chunks. Since the number - * of VFIO mappings is limited, and VFIO appears to not concatenate - * adjacent mappings, we have to do this ourselves. - * - * So, find contiguous chunks, then map them. - */ - va_start = ms->addr_64; - iova_start = iova_expected = ms->iova; while (cur_len < len) { - bool new_contig_area = ms->iova != iova_expected; - bool last_seg = (len - cur_len) == ms->len; - bool skip_last = false; - - /* only do mappings when current contiguous area ends */ - if (new_contig_area) { - if (type == RTE_MEM_EVENT_ALLOC) - vfio_dma_mem_map(default_vfio_cfg, va_start, - iova_start, - iova_expected - iova_start, 1); - else - vfio_dma_mem_map(default_vfio_cfg, va_start, - iova_start, - iova_expected - iova_start, 0); - va_start = ms->addr_64; - iova_start = ms->iova; - } /* some memory segments may have invalid IOVA */ if (ms->iova == RTE_BAD_IOVA) { RTE_LOG(DEBUG, EAL, "Memory segment at %p has bad IOVA, skipping\n", ms->addr); - skip_last = true; + goto next; } - iova_expected = ms->iova + ms->len; + if (type == RTE_MEM_EVENT_ALLOC) + vfio_dma_mem_map(default_vfio_cfg, ms->addr_64, + ms->iova, ms->len, 1); + else + vfio_dma_mem_map(default_vfio_cfg, ms->addr_64, + ms->iova, ms->len, 0); +next: cur_len += ms->len; ++ms; - - /* - * don't count previous segment, and don't attempt to - * dereference a potentially invalid pointer. - */ - if (skip_last && !last_seg) { - iova_expected = iova_start = ms->iova; - va_start = ms->addr_64; - } else if (!skip_last && last_seg) { - /* this is the last segment and we're not skipping */ - if (type == RTE_MEM_EVENT_ALLOC) - vfio_dma_mem_map(default_vfio_cfg, va_start, - iova_start, - iova_expected - iova_start, 1); - else - vfio_dma_mem_map(default_vfio_cfg, va_start, - iova_start, - iova_expected - iova_start, 0); - } } #ifdef RTE_ARCH_PPC_64 cur_len = 0; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:29.646596418 +0200 +++ 0001-vfio-do-not-merge-contiguous-areas.patch 2021-05-17 17:40:29.087808815 +0200 @@ -1 +1 @@ -From 016763c219580292c8b05059c7452a7a11d0d19e Mon Sep 17 00:00:00 2001 +From b92fd56073afacb5ba3a31c42a5526b96399ff74 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 016763c219580292c8b05059c7452a7a11d0d19e ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ - lib/librte_eal/linux/eal_vfio.c | 59 ++++---------------------- + lib/librte_eal/linux/eal/eal_vfio.c | 59 ++++---------------------- @@ -31 +32 @@ -index 90635a45d9..c6b6881ea2 100644 +index 96817e78cd..d8e5ad711a 100644 @@ -34,2 +35,2 @@ -@@ -25,6 +25,16 @@ To make use of VFIO, the ``vfio-pci`` module must be loaded: - VFIO kernel is usually present by default in all distributions, +@@ -72,6 +72,16 @@ Note that in order to use VFIO, your kernel must support it. + VFIO kernel modules have been included in the Linux kernel since version 3.6.0 and are usually present by default, @@ -48,8 +49,8 @@ - Since Linux version 5.7, - the ``vfio-pci`` module supports the creation of virtual functions. - After the PF is bound to ``vfio-pci`` module, -diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c -index 050082444e..64b134d530 100644 ---- a/lib/librte_eal/linux/eal_vfio.c -+++ b/lib/librte_eal/linux/eal_vfio.c -@@ -517,11 +517,9 @@ static void + Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d). + + .. note:: +diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c +index 1be02e7f13..5e6101d9a9 100644 +--- a/lib/librte_eal/linux/eal/eal_vfio.c ++++ b/lib/librte_eal/linux/eal/eal_vfio.c +@@ -514,11 +514,9 @@ static void @@ -67,2 +68,2 @@ -@@ -539,63 +537,22 @@ vfio_mem_event_callback(enum rte_mem_event type, const void *addr, size_t len, - +@@ -547,63 +545,22 @@ vfio_mem_event_callback(enum rte_mem_event type, const void *addr, size_t len, + #endif @@ -137,2 +138,2 @@ - } - + #ifdef RTE_ARCH_PPC_64 + cur_len = 0;