eal: fix build for 32-bit system

lib/librte_eal/linuxapp/eal/eal_memory.c:324:4: error: comparison
is always false due to limited range of data type [-Werror=type-limits]
    || (hugepage_sz == RTE_PGSIZE_16G)) {
    ^

This was introuduced by commit b77b5639:
        mem: add huge page sizes for IBM Power

The root cause is that size_t is 32-bit in i686 platform,
but RTE_PGSIZE_16M and RTE_PGSIZE_16G are always 64-bit.

Force hugepage_sz to always 64-bit to avoid this issue.

Signed-off-by: Michael Qiu <michael.qiu@intel.com>
Suggested-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index 412b43295f3df603d39ae291174a8238829adeca..77830f80af70f8b4c556192f3812e1c9d8dbe525 100644 (file)
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -96,7 +96,7 @@ rte_dump_physmem_layout(FILE *f)
 
                fprintf(f, "Segment %u: phys:0x%"PRIx64", len:%zu, "
                       "virt:%p, socket_id:%"PRId32", "
-                      "hugepage_sz:%zu, nchannel:%"PRIx32", "
+                      "hugepage_sz:%"PRIu64", nchannel:%"PRIx32", "
                       "nrank:%"PRIx32"\n", i,
                       mcfg->memseg[i].phys_addr,
                       mcfg->memseg[i].len,

diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/librte_eal/common/eal_internal_cfg.h
index aac6abf4a030f10724f01d43b0d3a227d17b2082..e2ecb0d0f09caa08955f61181bf5427eaf6cc517 100644 (file)
--- a/lib/librte_eal/common/eal_internal_cfg.h
+++ b/lib/librte_eal/common/eal_internal_cfg.h
@@ -49,7 +49,7 @@
  * mount points of hugepages
  */
 struct hugepage_info {
-       size_t hugepage_sz;   /**< size of a huge page */
+       uint64_t hugepage_sz;   /**< size of a huge page */
        const char *hugedir;    /**< dir where hugetlbfs is mounted */
        uint32_t num_pages[RTE_MAX_NUMA_NODES];
                                /**< number of hugepages of that size on each socket */

diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h
index 1990833448a80e4f8038db46834ea1021ffaa69e..7f8103f4195d7f8d5fb78ad2eb3ad51e4107981c 100644 (file)
--- a/lib/librte_eal/common/include/rte_memory.h
+++ b/lib/librte_eal/common/include/rte_memory.h
@@ -92,7 +92,7 @@ struct rte_memseg {
        phys_addr_t ioremap_addr; /**< Real physical address inside the VM */
 #endif
        size_t len;               /**< Length of the segment. */
-       size_t hugepage_sz;       /**< The pagesize of underlying memory */
+       uint64_t hugepage_sz;       /**< The pagesize of underlying memory */
        int32_t socket_id;          /**< NUMA socket ID. */
        uint32_t nchannel;          /**< Number of channels. */
        uint32_t nrank;             /**< Number of ranks. */

diff --git a/lib/librte_eal/common/include/rte_memzone.h b/lib/librte_eal/common/include/rte_memzone.h
index 7d47bffecc1d1d1697453d35f5685d767dc2afad..81b6ad4056d160cdbb081eddc9c4215dec23b50f 100644 (file)
--- a/lib/librte_eal/common/include/rte_memzone.h
+++ b/lib/librte_eal/common/include/rte_memzone.h
@@ -83,7 +83,7 @@ struct rte_memzone {
 #endif
        size_t len;                       /**< Length of the memzone. */
 
-       size_t hugepage_sz;               /**< The page size of underlying memory */
+       uint64_t hugepage_sz;             /**< The page size of underlying memory */
 
        int32_t socket_id;                /**< NUMA socket ID. */
 

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index e6cb919bcd71b2069bbdea19f7c07a7bccdf003b..bae25079882038e8720fb095952eae69fd250c5a 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -300,7 +300,7 @@ map_all_hugepages(struct hugepage_file *hugepg_tbl,
 #endif
 
        for (i = 0; i < hpi->num_pages[0]; i++) {
-               size_t hugepage_sz = hpi->hugepage_sz;
+               uint64_t hugepage_sz = hpi->hugepage_sz;
 
                if (orig) {
                        hugepg_tbl[i].file_id = i;