[17.11] mem: fix max DMA maskbit size

Message ID 1535727232-44836-1-git-send-email-alejandro.lucero@netronome.com (mailing list archive)
State Not Applicable, archived
Delegated to: Thomas Monjalon
Headers
Series [17.11] mem: fix max DMA maskbit size |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Alejandro Lucero Aug. 31, 2018, 2:53 p.m. UTC
  The sanity check inside rte_eal_check_dma_mask is using 47 bits as
the maximum size. It turns out there are some IOMMU hardware reporting
48 bits precluding the IOVA VA mode to be enabled.

It is harmless to raise the maximum mask size to 63 bits.

This patch also removes any reference to unused X86_VA_WIDTH.

Fixes: 3a80bc50c949 ("mem: add function for checking memsegs IOVAs addresses")

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/bus/pci/linux/pci.c               | 1 -
 lib/librte_eal/common/eal_common_memory.c | 5 -----
 2 files changed, 6 deletions(-)
  

Comments

Yongseok Koh Sept. 2, 2018, 5:17 p.m. UTC | #1
> On Aug 31, 2018, at 7:53 AM, Alejandro Lucero <alejandro.lucero@netronome.com> wrote:
> 
> The sanity check inside rte_eal_check_dma_mask is using 47 bits as
> the maximum size. It turns out there are some IOMMU hardware reporting
> 48 bits precluding the IOVA VA mode to be enabled.
> 
> It is harmless to raise the maximum mask size to 63 bits.
> 
> This patch also removes any reference to unused X86_VA_WIDTH.
> 
> Fixes: 3a80bc50c949 ("mem: add function for checking memsegs IOVAs addresses")
> 
> Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
> ---

Applied to stable/17.11.

Thanks,
Yongseok
  

Patch

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index c81ed50..44440f2 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -583,7 +583,6 @@ 
 {
 #define VTD_CAP_MGAW_SHIFT	16
 #define VTD_CAP_MGAW_MASK	(0x3fULL << VTD_CAP_MGAW_SHIFT)
-#define X86_VA_WIDTH 47 /* From Documentation/x86/x86_64/mm.txt */
 	struct rte_pci_addr *addr = &dev->addr;
 	char filename[PATH_MAX];
 	FILE *fp;
diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 00ab393..a0922f1 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -109,13 +109,8 @@ 
 	}
 }
 
-#if defined(RTE_ARCH_X86)
-#define X86_VA_WIDTH 47 /* From Documentation/x86/x86_64/mm.txt */
-#define MAX_DMA_MASK_BITS X86_VA_WIDTH
-#else
 /* 63 bits is good enough for a sanity check */
 #define MAX_DMA_MASK_BITS 63
-#endif
 
 /* check memseg iovas are within the required range based on dma mask */
 int