Skip to contentSkip to conversation

net/iavf: enable more link speed

PATCH In review Qi Zhang 3 participants 4 messages May 4, 2019 – May 14, 2019 Network drivers

lore
Share & tools
lore

Qi Zhang

author
#0 lore raw

PATCH 1/1 net/iavf: enable more link speed

Enable advanced link speed mode (VIRTCHNL_VF_CAP_ADV_LINK_SPEED) so iavf PMD can identify more link speed that reported by pf.

---
 drivers/net/iavf/base/virtchnl.h | 17 ++++++++++++++++-
 drivers/net/iavf/iavf.h          |  2 +-
 drivers/net/iavf/iavf_ethdev.c   | 21 +++++++++++++++------
 drivers/net/iavf/iavf_vchnl.c    |  4 ++--
 4 files changed, 34 insertions(+), 10 deletions(-)
drivers/net/iavf/base/virtchnl.h +16 -1
index 13bfdb86b..10b65380c 100644
@@ -258,6 +258,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
 #define VIRTCHNL_VF_OFFLOAD_ENCAP		0X00100000
 #define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM		0X00200000
 #define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM	0X00400000
+/* Define below the capability flags that are not offloads */
+#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED          0x00000080
 
 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
 			       VIRTCHNL_VF_OFFLOAD_VLAN | \
@@ -562,10 +564,23 @@ enum virtchnl_event_codes {
 struct virtchnl_pf_event {
 	enum virtchnl_event_codes event;
 	union {
+		/* If the PF driver does not support the new speed reporting
+		 * capabilities then use link_event else use link_event_adv to
+		 * get the speed and link information. The ability to understand
+		 * new speeds is indicated by setting the capability flag
+		 * VIRTCHNL_VF_CAP_ADV_LINK_SPEED in vf_cap_flags parameter
+		 * in virtchnl_vf_resource struct and can be used to determine
+		 * which link event struct to use below.
+		 */
 		struct {
 			enum virtchnl_link_speed link_speed;
-			bool link_status;
+			u8 link_status;
 		} link_event;
+		struct {
+			/* link_speed provided in Mbps */
+			u32 link_speed;
+			u8 link_status;
+		} link_event_adv;
 	} event_data;
 
 	int severity;
drivers/net/iavf/iavf.h +1 -1
index e6e3e8d30..9a334e41c 100644
@@ -95,7 +95,7 @@ struct iavf_info {
 	/* Event from pf */
 	bool dev_closed;
 	bool link_up;
-	enum virtchnl_link_speed link_speed;
+	uint32_t link_speed;
 
 	struct iavf_vsi vsi;
 	bool vf_reset;
drivers/net/iavf/iavf_ethdev.c +15 -6
index 7a0696ed7..bd9c5ecdf 100644
@@ -584,24 +584,33 @@ iavf_dev_link_update(struct rte_eth_dev *dev,
 	 *  when receive LINK_CHANGE evnet from PF by Virtchnnl.
 	 */
 	switch (vf->link_speed) {
-	case VIRTCHNL_LINK_SPEED_100MB:
+	case 10:
+		new_link.link_speed = ETH_SPEED_NUM_10M;
+		break;
+	case 100:
 		new_link.link_speed = ETH_SPEED_NUM_100M;
 		break;
-	case VIRTCHNL_LINK_SPEED_1GB:
+	case 1000:
 		new_link.link_speed = ETH_SPEED_NUM_1G;
 		break;
-	case VIRTCHNL_LINK_SPEED_10GB:
+	case 10000:
 		new_link.link_speed = ETH_SPEED_NUM_10G;
 		break;
-	case VIRTCHNL_LINK_SPEED_20GB:
+	case 20000:
 		new_link.link_speed = ETH_SPEED_NUM_20G;
 		break;
-	case VIRTCHNL_LINK_SPEED_25GB:
+	case 25000:
 		new_link.link_speed = ETH_SPEED_NUM_25G;
 		break;
-	case VIRTCHNL_LINK_SPEED_40GB:
+	case 40000:
 		new_link.link_speed = ETH_SPEED_NUM_40G;
 		break;
+	case 50000:
+		new_link.link_speed = ETH_SPEED_NUM_50G;
+		break;
+	case 100000:
+		new_link.link_speed = ETH_SPEED_NUM_100G;
+		break;
 	default:
 		new_link.link_speed = ETH_SPEED_NUM_NONE;
 		break;
drivers/net/iavf/iavf_vchnl.c +2 -2
index 6381fb63c..da6401d35 100644
@@ -153,7 +153,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
 	case VIRTCHNL_EVENT_LINK_CHANGE:
 		PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
 		vf->link_up = pf_msg->event_data.link_event.link_status;
-		vf->link_speed = pf_msg->event_data.link_event.link_speed;
+		vf->link_speed = pf_msg->event_data.link_event_adv.link_speed;
 		iavf_dev_link_update(dev, 0);
 		_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
 					      NULL);
@@ -344,7 +344,7 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
 	 * add advanced/optional offload capabilities
 	 */
 
-	caps = IAVF_BASIC_OFFLOAD_CAPS;
+	caps = IAVF_BASIC_OFFLOAD_CAPS | VIRTCHNL_VF_CAP_ADV_LINK_SPEED;
 
 	args.in_args = (uint8_t *)∩︀
 	args.in_args_size = sizeof(caps);
Signature · 1 line
2.13.6
Acked-by on v1 1/1
#1 lore raw
Quoted 147 lines

-----Original Message-----
From: Zhang, Qi Z
Sent: Saturday, May 4, 2019 10:09 PM
To: Lu, Wenzhuo <[email protected]>; Zhao1, Wei <[email protected]>
Cc: Stillwell Jr, Paul M <[email protected]>; [email protected]; Zhang, Qi Z <[email protected]>; [email protected]
Subject: [PATCH] net/iavf: enable more link speed

Enable advanced link speed mode (VIRTCHNL_VF_CAP_ADV_LINK_SPEED) so iavf PMD can identify more link speed that reported by pf.

---
 drivers/net/iavf/base/virtchnl.h | 17 ++++++++++++++++-
 drivers/net/iavf/iavf.h          |  2 +-
 drivers/net/iavf/iavf_ethdev.c   | 21 +++++++++++++++------
 drivers/net/iavf/iavf_vchnl.c    |  4 ++--
 4 files changed, 34 insertions(+), 10 deletions(-)
drivers/net/iavf/base/virtchnl.h +2 -0
index 13bfdb86b..10b65380c 100644
@@ -258,6 +258,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(16,
 virtchnl_vsi_resource);
 #define VIRTCHNL_VF_OFFLOAD_ENCAP		0X00100000
 #define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM		0X00200000
 #define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM	0X00400000
+/* Define below the capability flags that are not offloads */
+#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED          0x00000080
 
 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
drivers/net/iavf/base/virtchnl.h +5 -0
 			       VIRTCHNL_VF_OFFLOAD_VLAN | \
@@ -562,10 +564,23 @@ enum virtchnl_event_codes {  struct
 virtchnl_pf_event {
 	enum virtchnl_event_codes event;
 	union {
+		/* If the PF driver does not support the new speed reporting
+		 * capabilities then use link_event else use link_event_adv to
+		 * get the speed and link information. The ability to understand
+		 * new speeds is indicated by setting the capability flag
+		 * VIRTCHNL_VF_CAP_ADV_LINK_SPEED in vf_cap_flags

parameter

drivers/net/iavf/base/virtchnl.h +9 -1
+		 * in virtchnl_vf_resource struct and can be used to determine
+		 * which link event struct to use below.
+		 */
 		struct {
 			enum virtchnl_link_speed link_speed;
-			bool link_status;
+			u8 link_status;
 		} link_event;
+		struct {
+			/* link_speed provided in Mbps */
+			u32 link_speed;
+			u8 link_status;
+		} link_event_adv;
 	} event_data;
 
 	int severity;
drivers/net/iavf/iavf.h index renamed from drivers/net/iavf/iavf.h +0 -0

e6e3e8d30..9a334e41c 100644

drivers/net/iavf/iavf.h +1 -1
@@ -95,7 +95,7 @@ struct iavf_info {
 	/* Event from pf */
 	bool dev_closed;
 	bool link_up;
-	enum virtchnl_link_speed link_speed;
+	uint32_t link_speed;
 
 	struct iavf_vsi vsi;
 	bool vf_reset;
drivers/net/iavf/iavf_ethdev.c index renamed from drivers/net/iavf/iavf_ethdev.c +0 -0

7a0696ed7..bd9c5ecdf 100644

drivers/net/iavf/iavf_ethdev.c +15 -6
@@ -584,24 +584,33 @@ iavf_dev_link_update(struct rte_eth_dev *dev,
 	 *  when receive LINK_CHANGE evnet from PF by Virtchnnl.
 	 */
 	switch (vf->link_speed) {
-	case VIRTCHNL_LINK_SPEED_100MB:
+	case 10:
+		new_link.link_speed = ETH_SPEED_NUM_10M;
+		break;
+	case 100:
 		new_link.link_speed = ETH_SPEED_NUM_100M;
 		break;
-	case VIRTCHNL_LINK_SPEED_1GB:
+	case 1000:
 		new_link.link_speed = ETH_SPEED_NUM_1G;
 		break;
-	case VIRTCHNL_LINK_SPEED_10GB:
+	case 10000:
 		new_link.link_speed = ETH_SPEED_NUM_10G;
 		break;
-	case VIRTCHNL_LINK_SPEED_20GB:
+	case 20000:
 		new_link.link_speed = ETH_SPEED_NUM_20G;
 		break;
-	case VIRTCHNL_LINK_SPEED_25GB:
+	case 25000:
 		new_link.link_speed = ETH_SPEED_NUM_25G;
 		break;
-	case VIRTCHNL_LINK_SPEED_40GB:
+	case 40000:
 		new_link.link_speed = ETH_SPEED_NUM_40G;
 		break;
+	case 50000:
+		new_link.link_speed = ETH_SPEED_NUM_50G;
+		break;
+	case 100000:
+		new_link.link_speed = ETH_SPEED_NUM_100G;
+		break;
 	default:
 		new_link.link_speed = ETH_SPEED_NUM_NONE;
 		break;
drivers/net/iavf/iavf_vchnl.c index renamed from drivers/net/iavf/iavf_vchnl.c +0 -0

6381fb63c..da6401d35 100644

drivers/net/iavf/iavf_vchnl.c +1 -1
@@ -153,7 +153,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev,
 uint8_t *msg,
 	case VIRTCHNL_EVENT_LINK_CHANGE:
 		PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE
 event");
 		vf->link_up = pf_msg->event_data.link_event.link_status;
-		vf->link_speed = pf_msg->event_data.link_event.link_speed;
+		vf->link_speed = pf_msg-
 >event_data.link_event_adv.link_speed;
drivers/net/iavf/iavf_vchnl.c +0 -0
 		iavf_dev_link_update(dev, 0);
 		_rte_eth_dev_callback_process(dev,

RTE_ETH_EVENT_INTR_LSC,

drivers/net/iavf/iavf_vchnl.c +1 -1
 					      NULL);
@@ -344,7 +344,7 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
 	 * add advanced/optional offload capabilities
 	 */
 
-	caps = IAVF_BASIC_OFFLOAD_CAPS;
+	caps = IAVF_BASIC_OFFLOAD_CAPS |
 VIRTCHNL_VF_CAP_ADV_LINK_SPEED;
 
 	args.in_args = (uint8_t *)&caps;

args.in_args_size = sizeof(caps);
--
2.13.6

author Applied
#2 lore raw
Quoted 10 lines

-----Original Message-----
From: Zhao1, Wei
Sent: Sunday, May 5, 2019 10:50 AM
To: Zhang, Qi Z <[email protected]>; Lu, Wenzhuo <[email protected]>
Cc: Stillwell Jr, Paul M <[email protected]>; [email protected]; [email protected]
Subject: RE: [PATCH] net/iavf: enable more link speed

Quoted 18 lines
Quoted 15 lines

-----Original Message-----
From: Zhang, Qi Z
Sent: Saturday, May 4, 2019 10:09 PM
To: Lu, Wenzhuo <[email protected]>; Zhao1, Wei <[email protected]>
Cc: Stillwell Jr, Paul M <[email protected]>; [email protected]; Zhang, Qi Z <[email protected]>; [email protected]
Subject: [PATCH] net/iavf: enable more link speed

Enable advanced link speed mode (VIRTCHNL_VF_CAP_ADV_LINK_SPEED) so iavf PMD can identify more link speed that reported by pf.

Applied to dpdk-next-net-intel.

Thanks
Qi

#3 lore raw
In reply to Qi Zhang
Quoted 5 lines · Qi Zhang

Enable advanced link speed mode (VIRTCHNL_VF_CAP_ADV_LINK_SPEED) so iavf PMD can identify more link speed that reported by pf.

There is no Fixes: tag and that looks correct as it is adding a new capability and in the process changing some of the existing code. Not applying for 18.11.2, we can discuss further for 18.11.3 if necessary.

Kevin.

Quoted 126 lines
---
 drivers/net/iavf/base/virtchnl.h | 17 ++++++++++++++++-
 drivers/net/iavf/iavf.h          |  2 +-
 drivers/net/iavf/iavf_ethdev.c   | 21 +++++++++++++++------
 drivers/net/iavf/iavf_vchnl.c    |  4 ++--
 4 files changed, 34 insertions(+), 10 deletions(-)
drivers/net/iavf/base/virtchnl.h +16 -1
index 13bfdb86b..10b65380c 100644
@@ -258,6 +258,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
 #define VIRTCHNL_VF_OFFLOAD_ENCAP		0X00100000
 #define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM		0X00200000
 #define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM	0X00400000
+/* Define below the capability flags that are not offloads */
+#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED          0x00000080
 
 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
 			       VIRTCHNL_VF_OFFLOAD_VLAN | \
@@ -562,10 +564,23 @@ enum virtchnl_event_codes {
 struct virtchnl_pf_event {
 	enum virtchnl_event_codes event;
 	union {
+		/* If the PF driver does not support the new speed reporting
+		 * capabilities then use link_event else use link_event_adv to
+		 * get the speed and link information. The ability to understand
+		 * new speeds is indicated by setting the capability flag
+		 * VIRTCHNL_VF_CAP_ADV_LINK_SPEED in vf_cap_flags parameter
+		 * in virtchnl_vf_resource struct and can be used to determine
+		 * which link event struct to use below.
+		 */
 		struct {
 			enum virtchnl_link_speed link_speed;
-			bool link_status;
+			u8 link_status;
 		} link_event;
+		struct {
+			/* link_speed provided in Mbps */
+			u32 link_speed;
+			u8 link_status;
+		} link_event_adv;
 	} event_data;
 
 	int severity;
drivers/net/iavf/iavf.h +1 -1
index e6e3e8d30..9a334e41c 100644
@@ -95,7 +95,7 @@ struct iavf_info {
 	/* Event from pf */
 	bool dev_closed;
 	bool link_up;
-	enum virtchnl_link_speed link_speed;
+	uint32_t link_speed;
 
 	struct iavf_vsi vsi;
 	bool vf_reset;
drivers/net/iavf/iavf_ethdev.c +15 -6
index 7a0696ed7..bd9c5ecdf 100644
@@ -584,24 +584,33 @@ iavf_dev_link_update(struct rte_eth_dev *dev,
 	 *  when receive LINK_CHANGE evnet from PF by Virtchnnl.
 	 */
 	switch (vf->link_speed) {
-	case VIRTCHNL_LINK_SPEED_100MB:
+	case 10:
+		new_link.link_speed = ETH_SPEED_NUM_10M;
+		break;
+	case 100:
 		new_link.link_speed = ETH_SPEED_NUM_100M;
 		break;
-	case VIRTCHNL_LINK_SPEED_1GB:
+	case 1000:
 		new_link.link_speed = ETH_SPEED_NUM_1G;
 		break;
-	case VIRTCHNL_LINK_SPEED_10GB:
+	case 10000:
 		new_link.link_speed = ETH_SPEED_NUM_10G;
 		break;
-	case VIRTCHNL_LINK_SPEED_20GB:
+	case 20000:
 		new_link.link_speed = ETH_SPEED_NUM_20G;
 		break;
-	case VIRTCHNL_LINK_SPEED_25GB:
+	case 25000:
 		new_link.link_speed = ETH_SPEED_NUM_25G;
 		break;
-	case VIRTCHNL_LINK_SPEED_40GB:
+	case 40000:
 		new_link.link_speed = ETH_SPEED_NUM_40G;
 		break;
+	case 50000:
+		new_link.link_speed = ETH_SPEED_NUM_50G;
+		break;
+	case 100000:
+		new_link.link_speed = ETH_SPEED_NUM_100G;
+		break;
 	default:
 		new_link.link_speed = ETH_SPEED_NUM_NONE;
 		break;
drivers/net/iavf/iavf_vchnl.c +2 -2
index 6381fb63c..da6401d35 100644
@@ -153,7 +153,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
 	case VIRTCHNL_EVENT_LINK_CHANGE:
 		PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
 		vf->link_up = pf_msg->event_data.link_event.link_status;
-		vf->link_speed = pf_msg->event_data.link_event.link_speed;
+		vf->link_speed = pf_msg->event_data.link_event_adv.link_speed;
 		iavf_dev_link_update(dev, 0);
 		_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
 					      NULL);
@@ -344,7 +344,7 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
 	 * add advanced/optional offload capabilities
 	 */
 
-	caps = IAVF_BASIC_OFFLOAD_CAPS;
+	caps = IAVF_BASIC_OFFLOAD_CAPS | VIRTCHNL_VF_CAP_ADV_LINK_SPEED;
 
 	args.in_args = (uint8_t *)&caps;
 	args.in_args_size = sizeof(caps);