diff mbox series

mem: fix division by zero in no-NUMA mode

Message ID 294f089848bf803ff134979c612bbf28e0e2e6b9.1543229588.git.anatoly.burakov@intel.com (mailing list archive)
State Accepted, archived
Headers show
Series mem: fix division by zero in no-NUMA mode | expand

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Burakov, Anatoly Nov. 26, 2018, 10:57 a.m. UTC
When RTE_EAL_NUMA_AWARE_HUGEPAGES is set to "n", not all memtypes
will be valid, because we skip some due to not supporting other
NUMA nodes, leading to a division by zero error down the line
because the necessary memtype fields weren't populated.

Fix it by limiting number of memtypes to number of memtypes we
have actually created.

Fixes: 1dd342d0fdc4 ("mem: improve segment list preallocation")
Cc: stable@dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memory.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Hunt Nov. 26, 2018, 11:14 a.m. UTC | #1
Hi Anatoly,

On 26/11/2018 10:57 AM, Anatoly Burakov wrote:
> When RTE_EAL_NUMA_AWARE_HUGEPAGES is set to "n", not all memtypes
> will be valid, because we skip some due to not supporting other
> NUMA nodes, leading to a division by zero error down the line
> because the necessary memtype fields weren't populated.
>
> Fix it by limiting number of memtypes to number of memtypes we
> have actually created.
>
> Fixes: 1dd342d0fdc4 ("mem: improve segment list preallocation")
> Cc: stable@dpdk.org
>
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> ---
>   lib/librte_eal/linuxapp/eal/eal_memory.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
> index 6f94621d4..32feb415d 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_memory.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
> @@ -2230,6 +2230,8 @@ memseg_primary_init(void)
>   				socket_id, hugepage_sz);
>   		}
>   	}
> +	/* number of memtypes could have been lower due to no NUMA support */
> +	n_memtypes = cur_type;
>   
>   	/* set up limits for types */
>   	max_mem = (uint64_t)RTE_MAX_MEM_MB << 20;

Fixes the issue on my machine. vm_power_manager crashes with floating point
exception without patch, starts successfully with patch.

Tested-by: David Hunt <david.hunt@intel.com>
Thomas Monjalon Nov. 26, 2018, 2:37 p.m. UTC | #2
26/11/2018 12:14, Hunt, David:
> Hi Anatoly,
> 
> On 26/11/2018 10:57 AM, Anatoly Burakov wrote:
> > When RTE_EAL_NUMA_AWARE_HUGEPAGES is set to "n", not all memtypes
> > will be valid, because we skip some due to not supporting other
> > NUMA nodes, leading to a division by zero error down the line
> > because the necessary memtype fields weren't populated.
> >
> > Fix it by limiting number of memtypes to number of memtypes we
> > have actually created.
> >
> > Fixes: 1dd342d0fdc4 ("mem: improve segment list preallocation")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> 
> Fixes the issue on my machine. vm_power_manager crashes with floating point
> exception without patch, starts successfully with patch.
> 
> Tested-by: David Hunt <david.hunt@intel.com>

Applied (in last minute), thanks
diff mbox series

Patch

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 6f94621d4..32feb415d 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -2230,6 +2230,8 @@  memseg_primary_init(void)
 				socket_id, hugepage_sz);
 		}
 	}
+	/* number of memtypes could have been lower due to no NUMA support */
+	n_memtypes = cur_type;
 
 	/* set up limits for types */
 	max_mem = (uint64_t)RTE_MAX_MEM_MB << 20;