[dpdk-dev] testpmd: Fix segmentation fault when portmask is specified

Message ID 1425021375-5763-1-git-send-email-mukawa@igel.co.jp (mailing list archive)
State Accepted, archived
Headers

Commit Message

Tetsuya Mukawa Feb. 27, 2015, 7:16 a.m. UTC
  If testpmd is invoked with portmask option like below, segmentation
fault will be occured. This patch fixes the issue.

Reported-by: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
---
 app/test-pmd/testpmd.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)
  

Comments

De Lara Guarch, Pablo Feb. 27, 2015, 10:06 a.m. UTC | #1
> -----Original Message-----
> From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp]
> Sent: Friday, February 27, 2015 7:16 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo; Tetsuya Mukawa
> Subject: [PATCH] testpmd: Fix segmentation fault when portmask is
> specified
> 
> If testpmd is invoked with portmask option like below, segmentation
> fault will be occured. This patch fixes the issue.
> 
> Reported-by: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
> ---
>  app/test-pmd/testpmd.c | 37 +++++++++++++++++++++++--------------
>  1 file changed, 23 insertions(+), 14 deletions(-)
> 
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index 43329ed..61291be 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -579,20 +579,6 @@ init_config(void)
>  						 socket_num);
>  	}
> 
> -	/* Configuration of Ethernet ports. */
> -	ports = rte_zmalloc("testpmd: ports",
> -			    sizeof(struct rte_port) * RTE_MAX_ETHPORTS,
> -			    RTE_CACHE_LINE_SIZE);
> -	if (ports == NULL) {
> -		rte_exit(EXIT_FAILURE,
> -				"rte_zmalloc(%d struct rte_port) failed\n",
> -				RTE_MAX_ETHPORTS);
> -	}
> -
> -	/* enabled allocated ports */
> -	for (pid = 0; pid < nb_ports; pid++)
> -		ports[pid].enabled = 1;
> -
>  	FOREACH_PORT(pid, ports) {
>  		port = &ports[pid];
>  		rte_eth_dev_info_get(pid, &port->dev_info);
> @@ -1999,6 +1985,26 @@ init_port_dcb_config(portid_t pid,struct
> dcb_config *dcb_conf)
>  	return 0;
>  }
> 
> +static void
> +init_port(void)
> +{
> +	portid_t pid;
> +
> +	/* Configuration of Ethernet ports. */
> +	ports = rte_zmalloc("testpmd: ports",
> +			    sizeof(struct rte_port) * RTE_MAX_ETHPORTS,
> +			    RTE_CACHE_LINE_SIZE);
> +	if (ports == NULL) {
> +		rte_exit(EXIT_FAILURE,
> +				"rte_zmalloc(%d struct rte_port) failed\n",
> +				RTE_MAX_ETHPORTS);
> +	}
> +
> +	/* enabled allocated ports */
> +	for (pid = 0; pid < nb_ports; pid++)
> +		ports[pid].enabled = 1;
> +}
> +
>  int
>  main(int argc, char** argv)
>  {
> @@ -2013,6 +2019,9 @@ main(int argc, char** argv)
>  	if (nb_ports == 0)
>  		RTE_LOG(WARNING, EAL, "No probed ethernet devices\n");
> 
> +	/* allocate port structures, and init them */
> +	init_port();
> +
>  	set_def_fwd_config();
>  	if (nb_lcores == 0)
>  		rte_panic("Empty set of forwarding logical cores - check the "
> --
> 1.9.1

Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
  
Thomas Monjalon Feb. 27, 2015, 11:25 p.m. UTC | #2
> > If testpmd is invoked with portmask option like below, segmentation
> > fault will be occured. This patch fixes the issue.
> > 
> > Reported-by: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
> 
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks
  

Patch

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 43329ed..61291be 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -579,20 +579,6 @@  init_config(void)
 						 socket_num);
 	}
 
-	/* Configuration of Ethernet ports. */
-	ports = rte_zmalloc("testpmd: ports",
-			    sizeof(struct rte_port) * RTE_MAX_ETHPORTS,
-			    RTE_CACHE_LINE_SIZE);
-	if (ports == NULL) {
-		rte_exit(EXIT_FAILURE,
-				"rte_zmalloc(%d struct rte_port) failed\n",
-				RTE_MAX_ETHPORTS);
-	}
-
-	/* enabled allocated ports */
-	for (pid = 0; pid < nb_ports; pid++)
-		ports[pid].enabled = 1;
-
 	FOREACH_PORT(pid, ports) {
 		port = &ports[pid];
 		rte_eth_dev_info_get(pid, &port->dev_info);
@@ -1999,6 +1985,26 @@  init_port_dcb_config(portid_t pid,struct dcb_config *dcb_conf)
 	return 0;
 }
 
+static void
+init_port(void)
+{
+	portid_t pid;
+
+	/* Configuration of Ethernet ports. */
+	ports = rte_zmalloc("testpmd: ports",
+			    sizeof(struct rte_port) * RTE_MAX_ETHPORTS,
+			    RTE_CACHE_LINE_SIZE);
+	if (ports == NULL) {
+		rte_exit(EXIT_FAILURE,
+				"rte_zmalloc(%d struct rte_port) failed\n",
+				RTE_MAX_ETHPORTS);
+	}
+
+	/* enabled allocated ports */
+	for (pid = 0; pid < nb_ports; pid++)
+		ports[pid].enabled = 1;
+}
+
 int
 main(int argc, char** argv)
 {
@@ -2013,6 +2019,9 @@  main(int argc, char** argv)
 	if (nb_ports == 0)
 		RTE_LOG(WARNING, EAL, "No probed ethernet devices\n");
 
+	/* allocate port structures, and init them */
+	init_port();
+
 	set_def_fwd_config();
 	if (nb_lcores == 0)
 		rte_panic("Empty set of forwarding logical cores - check the "