Tested-by: Jiaqi Min <jiaqix....@intel.com>
-----Original Message-----
From: dev <dev-boun...@dpdk.org> On Behalf Of Jeff Guo
Sent: Thursday, September 3, 2020 4:39 PM
To: Sun, GuinanX <guinanx....@intel.com>; dev@dpdk.org
Cc: Xing, Beilei <beilei.x...@intel.com>; sta...@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4] net/i40e: fix link status
Acked-by: Jeff Guo <jia....@intel.com>
On 9/2/2020 4:06 PM, Guinan Sun wrote:
> If the PF driver supports the new speed reporting capabilities then
> use link_event_adv instead of link_event to get the speed.
>
> Fixes: 2a73125b7041 ("i40evf: fix link info update")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Guinan Sun <guinanx....@intel.com>
> Tested-by: Shougang Wang <shougangx.w...@intel.com>
> ---
> v4:
> * fix compilation issue in meson build
> v3:
> * request the capability for i40evf
> v2:
> * modify commit log
> * add code comments
> * delete useless code
> ---
> drivers/net/i40e/base/virtchnl.h | 16 ++++++++++-
> drivers/net/i40e/i40e_ethdev_vf.c | 45 ++++++++++++++++++++++++++++---
> 2 files changed, 57 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/i40e/base/virtchnl.h
> b/drivers/net/i40e/base/virtchnl.h
> index 4f498ca45..9c64fd469 100644
> --- a/drivers/net/i40e/base/virtchnl.h
> +++ b/drivers/net/i40e/base/virtchnl.h
> @@ -240,7 +240,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 | \
> VIRTCHNL_VF_OFFLOAD_RSS_PF) @@ -536,10 +537,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;
> } link_event;
> + struct {
> + /* link_speed provided in Mbps */
> + u32 link_speed;
> + u8 link_status;
> + } link_event_adv;
> } event_data;
>
> int severity;
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> index 69cab8e73..664de5e5e 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -469,7 +469,8 @@ i40evf_get_vf_resource(struct rte_eth_dev *dev)
> VIRTCHNL_VF_OFFLOAD_RSS_AQ |
> VIRTCHNL_VF_OFFLOAD_RSS_REG |
> VIRTCHNL_VF_OFFLOAD_VLAN |
> - VIRTCHNL_VF_OFFLOAD_RX_POLLING;
> + VIRTCHNL_VF_OFFLOAD_RX_POLLING |
> + VIRTCHNL_VF_CAP_ADV_LINK_SPEED;
> args.in_args = (uint8_t *)∩︀
> args.in_args_size = sizeof(caps);
> } else {
> @@ -1386,8 +1387,46 @@ i40evf_handle_pf_event(struct rte_eth_dev *dev,
> uint8_t *msg,
> break;
> 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;
> +
> + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_ADV_LINK_SPEED) {
> + vf->link_up =
> + pf_msg->event_data.link_event_adv.link_status;
> +
> + switch (pf_msg->event_data.link_event_adv.link_speed) {
> + case ETH_SPEED_NUM_100M:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_100MB;
> + break;
> + case ETH_SPEED_NUM_1G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_1GB;
> + break;
> + case ETH_SPEED_NUM_2_5G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_2_5GB;
> + break;
> + case ETH_SPEED_NUM_5G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_5GB;
> + break;
> + case ETH_SPEED_NUM_10G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_10GB;
> + break;
> + case ETH_SPEED_NUM_20G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_20GB;
> + break;
> + case ETH_SPEED_NUM_25G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_25GB;
> + break;
> + case ETH_SPEED_NUM_40G:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_40GB;
> + break;
> + default:
> + vf->link_speed = VIRTCHNL_LINK_SPEED_UNKNOWN;
> + break;
> + }
> + } else {
> + vf->link_up =
> + pf_msg->event_data.link_event.link_status;
> + vf->link_speed =
> + pf_msg->event_data.link_event.link_speed;
> + }
> break;
> case VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
> PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event");
