[PATCH] app/test: fix stack overflow in lpm6_perf_autotest

[PATCH] app/test: fix stack overflow in lpm6_perf_autotest

[Andre Muezerie]

Test lpm6_perf_autotest was hitting a stack overflow on Windows
with both MSVC and Clang.

The fix is to move some of the data from the stack to the heap.

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 app/test/test_lpm6_perf.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
index 1860a99ed6..8231ad825d 100644
--- a/app/test/test_lpm6_perf.c
+++ b/app/test/test_lpm6_perf.c
@@ -117,8 +117,12 @@ test_lpm6_perf(void)
 	total_time = 0;
 	count = 0;
 
-	struct rte_ipv6_addr ip_batch[NUM_IPS_ENTRIES];
-	int32_t next_hops[NUM_IPS_ENTRIES];
+	struct rte_ipv6_addr *ip_batch = (struct rte_ipv6_addr *)malloc(
+			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES);
+	TEST_LPM_ASSERT(ip_batch != NULL);
+
+	int32_t *next_hops = (int32_t *)malloc(sizeof(int32_t) * NUM_IPS_ENTRIES);
+	TEST_LPM_ASSERT(next_hops != NULL);
 
 	for (i = 0; i < NUM_IPS_ENTRIES; i++)
 		ip_batch[i] = large_ips_table[i].ip;
@@ -153,6 +157,9 @@ test_lpm6_perf(void)
 	printf("Average LPM Delete: %g cycles\n",
 			(double)total_time / NUM_ROUTE_ENTRIES);
 
+	free(next_hops);
+	free(ip_batch);
+
 	rte_lpm6_delete_all(lpm);
 	rte_lpm6_free(lpm);
 
-- 
2.47.0.vfs.0.3

Re: [PATCH] app/test: fix stack overflow in lpm6_perf_autotest

[Medvedkin, Vladimir]

Hi Andre,

On 13/12/2024 02:39, Andre Muezerie wrote:
> Test lpm6_perf_autotest was hitting a stack overflow on Windows
> with both MSVC and Clang.
>
> The fix is to move some of the data from the stack to the heap.
>
> Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> ---
>   app/test/test_lpm6_perf.c | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
> index 1860a99ed6..8231ad825d 100644
> --- a/app/test/test_lpm6_perf.c
> +++ b/app/test/test_lpm6_perf.c
> @@ -117,8 +117,12 @@ test_lpm6_perf(void)
>   	total_time = 0;
>   	count = 0;
>   
> -	struct rte_ipv6_addr ip_batch[NUM_IPS_ENTRIES];
> -	int32_t next_hops[NUM_IPS_ENTRIES];
> +	struct rte_ipv6_addr *ip_batch = (struct rte_ipv6_addr *)malloc(
why not rte_malloc?
> +			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES);
> +	TEST_LPM_ASSERT(ip_batch != NULL);
> +
> +	int32_t *next_hops = (int32_t *)malloc(sizeof(int32_t) * NUM_IPS_ENTRIES);
> +	TEST_LPM_ASSERT(next_hops != NULL);
>   
>   	for (i = 0; i < NUM_IPS_ENTRIES; i++)
>   		ip_batch[i] = large_ips_table[i].ip;
> @@ -153,6 +157,9 @@ test_lpm6_perf(void)
>   	printf("Average LPM Delete: %g cycles\n",
>   			(double)total_time / NUM_ROUTE_ENTRIES);
>   
> +	free(next_hops);
> +	free(ip_batch);
> +
>   	rte_lpm6_delete_all(lpm);
>   	rte_lpm6_free(lpm);
>   

-- 
Regards,
Vladimir

Re: [PATCH] app/test: fix stack overflow in lpm6_perf_autotest

[Andre Muezerie]

On Fri, Dec 13, 2024 at 10:22:20AM +0000, Medvedkin, Vladimir wrote:
> Hi Andre,
> 
> On 13/12/2024 02:39, Andre Muezerie wrote:
> >Test lpm6_perf_autotest was hitting a stack overflow on Windows
> >with both MSVC and Clang.
> >
> >The fix is to move some of the data from the stack to the heap.
> >
> >Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> >---
> >  app/test/test_lpm6_perf.c | 11 +++++++++--
> >  1 file changed, 9 insertions(+), 2 deletions(-)
> >
> >diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
> >index 1860a99ed6..8231ad825d 100644
> >--- a/app/test/test_lpm6_perf.c
> >+++ b/app/test/test_lpm6_perf.c
> >@@ -117,8 +117,12 @@ test_lpm6_perf(void)
> >  	total_time = 0;
> >  	count = 0;
> >-	struct rte_ipv6_addr ip_batch[NUM_IPS_ENTRIES];
> >-	int32_t next_hops[NUM_IPS_ENTRIES];
> >+	struct rte_ipv6_addr *ip_batch = (struct rte_ipv6_addr *)malloc(
> why not rte_malloc?

For no good reason :-)
I'll update the patch.
Thanks for the suggestion.

Andre Muezerie

> >+			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES);
> >+	TEST_LPM_ASSERT(ip_batch != NULL);
> >+
> >+	int32_t *next_hops = (int32_t *)malloc(sizeof(int32_t) * NUM_IPS_ENTRIES);
> >+	TEST_LPM_ASSERT(next_hops != NULL);
> >  	for (i = 0; i < NUM_IPS_ENTRIES; i++)
> >  		ip_batch[i] = large_ips_table[i].ip;
> >@@ -153,6 +157,9 @@ test_lpm6_perf(void)
> >  	printf("Average LPM Delete: %g cycles\n",
> >  			(double)total_time / NUM_ROUTE_ENTRIES);
> >+	free(next_hops);
> >+	free(ip_batch);
> >+
> >  	rte_lpm6_delete_all(lpm);
> >  	rte_lpm6_free(lpm);
> 
> -- 
> Regards,
> Vladimir

Re: [PATCH] app/test: fix stack overflow in lpm6_perf_autotest

[Stephen Hemminger]

On Fri, 13 Dec 2024 10:22:20 +0000
"Medvedkin, Vladimir" <vladimir.medvedkin@intel.com> wrote:

> Hi Andre,
> 
> On 13/12/2024 02:39, Andre Muezerie wrote:
> > Test lpm6_perf_autotest was hitting a stack overflow on Windows
> > with both MSVC and Clang.
> >
> > The fix is to move some of the data from the stack to the heap.
> >
> > Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
> > ---
> >   app/test/test_lpm6_perf.c | 11 +++++++++--
> >   1 file changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
> > index 1860a99ed6..8231ad825d 100644
> > --- a/app/test/test_lpm6_perf.c
> > +++ b/app/test/test_lpm6_perf.c
> > @@ -117,8 +117,12 @@ test_lpm6_perf(void)
> >   	total_time = 0;
> >   	count = 0;
> >   
> > -	struct rte_ipv6_addr ip_batch[NUM_IPS_ENTRIES];
> > -	int32_t next_hops[NUM_IPS_ENTRIES];
> > +	struct rte_ipv6_addr *ip_batch = (struct rte_ipv6_addr *)malloc(  
> why not rte_malloc?
> > +			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES);
> > +	TEST_LPM_ASSERT(ip_batch != NULL);

There is no need for rte_malloc() here. The data doesn't need to
come from hugepages and regular malloc() has more checking.

But the cast is unnecessary in C.

[PATCH v2] app/test: fix stack overflow in lpm6_perf_autotest

[Andre Muezerie]

Test lpm6_perf_autotest was hitting a stack overflow on Windows
with both MSVC and Clang.

The fix is to move some of the data from the stack to the heap.

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 app/test/test_lpm6_perf.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
index 1860a99ed6..a09e8611ce 100644
--- a/app/test/test_lpm6_perf.c
+++ b/app/test/test_lpm6_perf.c
@@ -10,6 +10,7 @@
 
 #include <rte_cycles.h>
 #include <rte_random.h>
+#include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_lpm6.h>
 
@@ -117,8 +118,14 @@ test_lpm6_perf(void)
 	total_time = 0;
 	count = 0;
 
-	struct rte_ipv6_addr ip_batch[NUM_IPS_ENTRIES];
-	int32_t next_hops[NUM_IPS_ENTRIES];
+	struct rte_ipv6_addr *ip_batch =
+			(struct rte_ipv6_addr *)rte_malloc("ip_batch",
+			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES, 0);
+	TEST_LPM_ASSERT(ip_batch != NULL);
+
+	int32_t *next_hops = (int32_t *)rte_malloc("next_hops",
+			sizeof(int32_t) * NUM_IPS_ENTRIES, 0);
+	TEST_LPM_ASSERT(next_hops != NULL);
 
 	for (i = 0; i < NUM_IPS_ENTRIES; i++)
 		ip_batch[i] = large_ips_table[i].ip;
@@ -153,6 +160,9 @@ test_lpm6_perf(void)
 	printf("Average LPM Delete: %g cycles\n",
 			(double)total_time / NUM_ROUTE_ENTRIES);
 
+	rte_free(next_hops);
+	rte_free(ip_batch);
+
 	rte_lpm6_delete_all(lpm);
 	rte_lpm6_free(lpm);
 
-- 
2.47.0.vfs.0.3

Re: [PATCH v2] app/test: fix stack overflow in lpm6_perf_autotest

[Stephen Hemminger]

On Fri, 13 Dec 2024 09:08:22 -0800
Andre Muezerie <andremue@linux.microsoft.com> wrote:

> +	struct rte_ipv6_addr *ip_batch =
> +			(struct rte_ipv6_addr *)rte_malloc("ip_batch",
> +			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES, 0

Cast is not needed here.
If you are going to allocate an array, use calloc() or rte_calloc()

Re: [PATCH v2] app/test: fix stack overflow in lpm6_perf_autotest

[Andre Muezerie]

On Fri, Dec 13, 2024 at 09:15:40AM -0800, Stephen Hemminger wrote:
> On Fri, 13 Dec 2024 09:08:22 -0800
> Andre Muezerie <andremue@linux.microsoft.com> wrote:
> 
> > +	struct rte_ipv6_addr *ip_batch =
> > +			(struct rte_ipv6_addr *)rte_malloc("ip_batch",
> > +			sizeof(struct rte_ipv6_addr) * NUM_IPS_ENTRIES, 0
> 
> Cast is not needed here.
> If you are going to allocate an array, use calloc() or rte_calloc()

Thanks for the comments. I'll update the patch.

[PATCH v3] app/test: fix stack overflow in lpm6_perf_autotest

[Andre Muezerie]

Test lpm6_perf_autotest was hitting a stack overflow on Windows
with both MSVC and Clang.

The fix is to move some of the data from the stack to the heap.

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 app/test/test_lpm6_perf.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c
index 1860a99ed6..59df0a958a 100644
--- a/app/test/test_lpm6_perf.c
+++ b/app/test/test_lpm6_perf.c
@@ -10,6 +10,7 @@
 
 #include <rte_cycles.h>
 #include <rte_random.h>
+#include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_lpm6.h>
 
@@ -117,8 +118,13 @@ test_lpm6_perf(void)
 	total_time = 0;
 	count = 0;
 
-	struct rte_ipv6_addr ip_batch[NUM_IPS_ENTRIES];
-	int32_t next_hops[NUM_IPS_ENTRIES];
+	struct rte_ipv6_addr *ip_batch = rte_calloc("ip_batch",
+			NUM_IPS_ENTRIES, sizeof(struct rte_ipv6_addr), 0);
+	TEST_LPM_ASSERT(ip_batch != NULL);
+
+	int32_t *next_hops = rte_calloc("next_hops",
+			NUM_IPS_ENTRIES, sizeof(int32_t), 0);
+	TEST_LPM_ASSERT(next_hops != NULL);
 
 	for (i = 0; i < NUM_IPS_ENTRIES; i++)
 		ip_batch[i] = large_ips_table[i].ip;
@@ -153,6 +159,9 @@ test_lpm6_perf(void)
 	printf("Average LPM Delete: %g cycles\n",
 			(double)total_time / NUM_ROUTE_ENTRIES);
 
+	rte_free(next_hops);
+	rte_free(ip_batch);
+
 	rte_lpm6_delete_all(lpm);
 	rte_lpm6_free(lpm);
 
-- 
2.47.0.vfs.0.3