net/idpf: refine dev_link_update function

Message ID 20230626111454.489844-1-mingxia.liu@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series net/idpf: refine dev_link_update function |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-abi-testing success Testing PASS
ci/iol-aarch-unit-testing success Testing PASS
ci/iol-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS

Commit Message

Liu, Mingxia June 26, 2023, 11:14 a.m. UTC
  This patch refines idpf_dev_link_update callback function according to
CPFL PMD basic code.

Signed-off-by: Mingxia Liu <mingxia.liu@intel.com>
---
 drivers/net/idpf/idpf_ethdev.c | 63 ++++++++++++++++------------------
 1 file changed, 30 insertions(+), 33 deletions(-)
  

Comments

Qi Zhang June 30, 2023, 8:27 a.m. UTC | #1
> -----Original Message-----
> From: Mingxia Liu <mingxia.liu@intel.com>
> Sent: Monday, June 26, 2023 7:15 PM
> To: dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Liu, Mingxia <mingxia.liu@intel.com>
> Subject: [PATCH] net/idpf: refine dev_link_update function
> 
> This patch refines idpf_dev_link_update callback function according to CPFL
> PMD basic code.
> 
> Signed-off-by: Mingxia Liu <mingxia.liu@intel.com>
> ---
>  drivers/net/idpf/idpf_ethdev.c | 63 ++++++++++++++++------------------
>  1 file changed, 30 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c
> index fb59655555..bfdac92b95 100644
> --- a/drivers/net/idpf/idpf_ethdev.c
> +++ b/drivers/net/idpf/idpf_ethdev.c
> @@ -30,6 +30,23 @@ static const char * const idpf_valid_args[] = {
>  	NULL
>  };
> 
> +uint32_t idpf_supported_speeds[] = {
> +	RTE_ETH_SPEED_NUM_NONE,
> +	RTE_ETH_SPEED_NUM_10M,
> +	RTE_ETH_SPEED_NUM_100M,
> +	RTE_ETH_SPEED_NUM_1G,
> +	RTE_ETH_SPEED_NUM_2_5G,
> +	RTE_ETH_SPEED_NUM_5G,
> +	RTE_ETH_SPEED_NUM_10G,
> +	RTE_ETH_SPEED_NUM_20G,
> +	RTE_ETH_SPEED_NUM_25G,
> +	RTE_ETH_SPEED_NUM_40G,
> +	RTE_ETH_SPEED_NUM_50G,
> +	RTE_ETH_SPEED_NUM_56G,
> +	RTE_ETH_SPEED_NUM_100G,
> +	RTE_ETH_SPEED_NUM_200G
> +};
> +
>  static const uint64_t idpf_map_hena_rss[] = {
>  	[IDPF_HASH_NONF_UNICAST_IPV4_UDP] =
>  			RTE_ETH_RSS_NONFRAG_IPV4_UDP,
> @@ -110,42 +127,22 @@ idpf_dev_link_update(struct rte_eth_dev *dev,  {
>  	struct idpf_vport *vport = dev->data->dev_private;
>  	struct rte_eth_link new_link;
> +	unsigned int i;
> 
>  	memset(&new_link, 0, sizeof(new_link));
> 
> -	switch (vport->link_speed) {
> -	case RTE_ETH_SPEED_NUM_10M:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_10M;
> -		break;
> -	case RTE_ETH_SPEED_NUM_100M:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_100M;
> -		break;
> -	case RTE_ETH_SPEED_NUM_1G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_1G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_10G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_10G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_20G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_20G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_25G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_25G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_40G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_40G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_50G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_50G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_100G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_100G;
> -		break;
> -	case RTE_ETH_SPEED_NUM_200G:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_200G;
> -		break;
> -	default:
> -		new_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
> +	for (i = 0; i < RTE_DIM(idpf_supported_speeds); i++) {
> +		if (vport->link_speed == idpf_supported_speeds[i]) {
> +			new_link.link_speed = vport->link_speed;
> +			break;
> +		}
> +	}
> +
> +	if (i == RTE_DIM(idpf_supported_speeds)) {
> +		if (vport->link_up)
> +			new_link.link_speed =
> RTE_ETH_SPEED_NUM_UNKNOWN;
> +		else
> +			new_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
>  	}

What about

/* initialize with default value */
new_link.link_speed = vport->link_up ?  RTE_ETH_SPEED_NUM_UNKNOWN : RTE_ETH_SPEED_NUM_NONE

/ * update in case a match */
for (i = 0; i < RTE_DIM(idpf_supported_speeds); i++) {
	....
}

> 
>  	new_link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
> --
> 2.34.1
  
Liu, Mingxia June 30, 2023, 10:46 a.m. UTC | #2
> -----Original Message-----
> From: Zhang, Qi Z <qi.z.zhang@intel.com>
> Sent: Friday, June 30, 2023 4:27 PM
> To: Liu, Mingxia <mingxia.liu@intel.com>; dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Liu, Mingxia <mingxia.liu@intel.com>
> Subject: RE: [PATCH] net/idpf: refine dev_link_update function
> 
> 
> 
> > -----Original Message-----
> > From: Mingxia Liu <mingxia.liu@intel.com>
> > Sent: Monday, June 26, 2023 7:15 PM
> > To: dev@dpdk.org
> > Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>; Liu, Mingxia <mingxia.liu@intel.com>
> > Subject: [PATCH] net/idpf: refine dev_link_update function
> >
> > This patch refines idpf_dev_link_update callback function according to
> > CPFL PMD basic code.
> >
> > Signed-off-by: Mingxia Liu <mingxia.liu@intel.com>
> > ---
> >  drivers/net/idpf/idpf_ethdev.c | 63
> > ++++++++++++++++------------------
> >  1 file changed, 30 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/net/idpf/idpf_ethdev.c
> > b/drivers/net/idpf/idpf_ethdev.c index fb59655555..bfdac92b95 100644
> > --- a/drivers/net/idpf/idpf_ethdev.c
> > +++ b/drivers/net/idpf/idpf_ethdev.c
> > @@ -30,6 +30,23 @@ static const char * const idpf_valid_args[] = {
> >  	NULL
> >  };
> >
> > +uint32_t idpf_supported_speeds[] = {
> > +	RTE_ETH_SPEED_NUM_NONE,
> > +	RTE_ETH_SPEED_NUM_10M,
> > +	RTE_ETH_SPEED_NUM_100M,
> > +	RTE_ETH_SPEED_NUM_1G,
> > +	RTE_ETH_SPEED_NUM_2_5G,
> > +	RTE_ETH_SPEED_NUM_5G,
> > +	RTE_ETH_SPEED_NUM_10G,
> > +	RTE_ETH_SPEED_NUM_20G,
> > +	RTE_ETH_SPEED_NUM_25G,
> > +	RTE_ETH_SPEED_NUM_40G,
> > +	RTE_ETH_SPEED_NUM_50G,
> > +	RTE_ETH_SPEED_NUM_56G,
> > +	RTE_ETH_SPEED_NUM_100G,
> > +	RTE_ETH_SPEED_NUM_200G
> > +};
> > +
> >  static const uint64_t idpf_map_hena_rss[] = {
> >  	[IDPF_HASH_NONF_UNICAST_IPV4_UDP] =
> >  			RTE_ETH_RSS_NONFRAG_IPV4_UDP,
> > @@ -110,42 +127,22 @@ idpf_dev_link_update(struct rte_eth_dev *dev,  {
> >  	struct idpf_vport *vport = dev->data->dev_private;
> >  	struct rte_eth_link new_link;
> > +	unsigned int i;
> >
> >  	memset(&new_link, 0, sizeof(new_link));
> >
> > -	switch (vport->link_speed) {
> > -	case RTE_ETH_SPEED_NUM_10M:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_10M;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_100M:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_100M;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_1G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_1G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_10G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_10G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_20G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_20G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_25G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_25G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_40G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_40G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_50G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_50G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_100G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_100G;
> > -		break;
> > -	case RTE_ETH_SPEED_NUM_200G:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_200G;
> > -		break;
> > -	default:
> > -		new_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
> > +	for (i = 0; i < RTE_DIM(idpf_supported_speeds); i++) {
> > +		if (vport->link_speed == idpf_supported_speeds[i]) {
> > +			new_link.link_speed = vport->link_speed;
> > +			break;
> > +		}
> > +	}
> > +
> > +	if (i == RTE_DIM(idpf_supported_speeds)) {
> > +		if (vport->link_up)
> > +			new_link.link_speed =
> > RTE_ETH_SPEED_NUM_UNKNOWN;
> > +		else
> > +			new_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
> >  	}
> 
> What about
> 
> /* initialize with default value */
> new_link.link_speed = vport->link_up ?  RTE_ETH_SPEED_NUM_UNKNOWN :
> RTE_ETH_SPEED_NUM_NONE
> 
> / * update in case a match */
> for (i = 0; i < RTE_DIM(idpf_supported_speeds); i++) {
> 	....
> }
> 
[Liu, Mingxia] Good idea, new patch has been sent.
> >
> >  	new_link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
> > --
> > 2.34.1
  

Patch

diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c
index fb59655555..bfdac92b95 100644
--- a/drivers/net/idpf/idpf_ethdev.c
+++ b/drivers/net/idpf/idpf_ethdev.c
@@ -30,6 +30,23 @@  static const char * const idpf_valid_args[] = {
 	NULL
 };
 
+uint32_t idpf_supported_speeds[] = {
+	RTE_ETH_SPEED_NUM_NONE,
+	RTE_ETH_SPEED_NUM_10M,
+	RTE_ETH_SPEED_NUM_100M,
+	RTE_ETH_SPEED_NUM_1G,
+	RTE_ETH_SPEED_NUM_2_5G,
+	RTE_ETH_SPEED_NUM_5G,
+	RTE_ETH_SPEED_NUM_10G,
+	RTE_ETH_SPEED_NUM_20G,
+	RTE_ETH_SPEED_NUM_25G,
+	RTE_ETH_SPEED_NUM_40G,
+	RTE_ETH_SPEED_NUM_50G,
+	RTE_ETH_SPEED_NUM_56G,
+	RTE_ETH_SPEED_NUM_100G,
+	RTE_ETH_SPEED_NUM_200G
+};
+
 static const uint64_t idpf_map_hena_rss[] = {
 	[IDPF_HASH_NONF_UNICAST_IPV4_UDP] =
 			RTE_ETH_RSS_NONFRAG_IPV4_UDP,
@@ -110,42 +127,22 @@  idpf_dev_link_update(struct rte_eth_dev *dev,
 {
 	struct idpf_vport *vport = dev->data->dev_private;
 	struct rte_eth_link new_link;
+	unsigned int i;
 
 	memset(&new_link, 0, sizeof(new_link));
 
-	switch (vport->link_speed) {
-	case RTE_ETH_SPEED_NUM_10M:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_10M;
-		break;
-	case RTE_ETH_SPEED_NUM_100M:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_100M;
-		break;
-	case RTE_ETH_SPEED_NUM_1G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_1G;
-		break;
-	case RTE_ETH_SPEED_NUM_10G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_10G;
-		break;
-	case RTE_ETH_SPEED_NUM_20G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_20G;
-		break;
-	case RTE_ETH_SPEED_NUM_25G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_25G;
-		break;
-	case RTE_ETH_SPEED_NUM_40G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_40G;
-		break;
-	case RTE_ETH_SPEED_NUM_50G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_50G;
-		break;
-	case RTE_ETH_SPEED_NUM_100G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_100G;
-		break;
-	case RTE_ETH_SPEED_NUM_200G:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_200G;
-		break;
-	default:
-		new_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
+	for (i = 0; i < RTE_DIM(idpf_supported_speeds); i++) {
+		if (vport->link_speed == idpf_supported_speeds[i]) {
+			new_link.link_speed = vport->link_speed;
+			break;
+		}
+	}
+
+	if (i == RTE_DIM(idpf_supported_speeds)) {
+		if (vport->link_up)
+			new_link.link_speed = RTE_ETH_SPEED_NUM_UNKNOWN;
+		else
+			new_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
 	}
 
 	new_link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;