X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Flinux%2Feal%2Feal_vfio.c;h=19e70bb662162b84dd97b131650636d2ad3652ff;hb=3c45889189924067e0c0e3f54dab36f1b938ab12;hp=c821e8382677ecf0e2b194f1afe45c667d7ab8a9;hpb=91d7846ce68d7c637cd7efde751f5276475aa9c8;p=dpdk.git

diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
index c821e83826..19e70bb662 100644
--- a/lib/librte_eal/linux/eal/eal_vfio.c
+++ b/lib/librte_eal/linux/eal/eal_vfio.c
@@ -1264,9 +1264,21 @@ vfio_type1_dma_mem_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,
 
 		ret = ioctl(vfio_container_fd, VFIO_IOMMU_MAP_DMA, &dma_map);
 		if (ret) {
-			RTE_LOG(ERR, EAL, "  cannot set up DMA remapping, error %i (%s)\n",
-				errno, strerror(errno));
+			/**
+			 * In case the mapping was already done EEXIST will be
+			 * returned from kernel.
+			 */
+			if (errno == EEXIST) {
+				RTE_LOG(DEBUG, EAL,
+					" Memory segment is allready mapped,"
+					" skipping");
+			} else {
+				RTE_LOG(ERR, EAL,
+					"  cannot set up DMA remapping,"
+					" error %i (%s)\n",
+					errno, strerror(errno));
 				return -1;
+			}
 		}
 	} else {
 		memset(&dma_unmap, 0, sizeof(dma_unmap));
@@ -1325,9 +1337,21 @@ vfio_spapr_dma_do_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,
 
 		ret = ioctl(vfio_container_fd, VFIO_IOMMU_MAP_DMA, &dma_map);
 		if (ret) {
-			RTE_LOG(ERR, EAL, "  cannot set up DMA remapping, error %i (%s)\n",
-				errno, strerror(errno));
+			/**
+			 * In case the mapping was already done EBUSY will be
+			 * returned from kernel.
+			 */
+			if (errno == EBUSY) {
+				RTE_LOG(DEBUG, EAL,
+					" Memory segment is allready mapped,"
+					" skipping");
+			} else {
+				RTE_LOG(ERR, EAL,
+					"  cannot set up DMA remapping,"
+					" error %i (%s)\n", errno,
+					strerror(errno));
 				return -1;
+			}
 		}
 
 	} else {