i40e: fix link reporting
Subsystems (2)
PATCH v2 1/2 i40e: fix link reporting
When querying the NVM for supported phy_types, on some firmware versions, we were failing to actually fill out the phy_types which means ethtool wouldn't report any link types.
Testing-hints:
Check 'ethtool <iface>' if you have the right (wrong?) firmware. Without this patch, no link modes will be reported.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +6 -1
@@ -1613,8 +1613,13 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw,if (report_init) {if (hw->mac.type ==I40E_MAC_XL710 && hw->aq.api_maj_ver ==I40E_FW_API_VERSION_MAJOR && - hw->aq.api_min_ver >=I40E_MINOR_VER_GET_LINK_INFO_XL710 ) + hw->aq.api_min_ver >=I40E_MINOR_VER_GET_LINK_INFO_XL710 ) { status =i40e_aq_get_link_info (hw, true,NULL ,NULL ); + }else { + hw->phy.phy_types =le32_to_cpu (abilities->phy_type); + hw->phy.phy_types |= + ((u64 )abilities->phy_type_ext <<32 ); + } }return status;
Signature · 1 line
2.14.2
PATCH v2 2/2 i40e/i40evf: don't trust VF to reset itself
When using 'ethtool -L' on a VF to change number of requested queues from PF, we shouldn't trust the VF to reset itself after making the request. Doing it that way opens the door for a potentially malicious VF to do nasty things to the PF which should never be the case.
This makes it such that after VF makes a successful request, PF will then reset the VF to institute required changes. Only if the request fails will PF send a message back to VF letting it know the request was unsuccessful.
Testing-hints:
There should be no real functional changes. This is simply hardening against a potentially malicious VF.
v2: remove extra commit tags
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 +++++++-- drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c | 7 +++---- include/linux/avf/virtchnl.h | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +7 -2
@@ -2045,8 +2045,9 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)* @msglen: msg length * * VFs get a default number of queues but can use this message to request a -* different number. Will respond with either the number requested or the -* maximum we can support. +* different number. If the request is successful, PF will reset the VF and +* return 0. If unsuccessful, PF will send message informing VF of number of +* available queues and return result of sending VF a message. **/ static int i40e_vc_request_queues_msg (struct i40e_vf *vf,u8 *msg,int msglen) {
@@ -2077,7 +2078,11 @@ static int i40e_vc_request_queues_msg(struct i40e_vf *vf, u8 *msg, int msglen) pf->queues_left); vfres->num_queue_pairs = pf->queues_left + cur_pairs; }else { +/* successful request */ vf->num_req_queues = req_pairs; +i40e_vc_notify_vf_reset (vf); +i40e_reset_vf (vf, false); +return 0 ; } return i40e_vc_send_msg_to_vf(vf, VIRTCHNL_OP_REQUEST_QUEUES, 0,
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +3 -4
@@ -407,6 +407,7 @@ int i40evf_request_queues(struct i40evf_adapter *adapter, int num) vfres.num_queue_pairs = num; adapter->current_op =VIRTCHNL_OP_REQUEST_QUEUES ; + adapter->flags |=I40EVF_FLAG_REINIT_ITR_NEEDED ;return i40evf_send_pf_msg (adapter,VIRTCHNL_OP_REQUEST_QUEUES , (u8 *)&vfres,sizeof (vfres)); }
@@ -1098,15 +1099,13 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,case VIRTCHNL_OP_REQUEST_QUEUES : {struct virtchnl_vf_res_request *vfres = (struct virtchnl_vf_res_request *)msg; -if (vfres->num_queue_pairs == adapter->num_req_queues) { - adapter->flags |=I40EVF_FLAG_REINIT_ITR_NEEDED ; -i40evf_schedule_reset (adapter); - }else { +if (vfres->num_queue_pairs != adapter->num_req_queues) {dev_info (&adapter->pdev->dev,"Requested %d queues, PF can support %d\n" , adapter->num_req_queues, vfres->num_queue_pairs); adapter->num_req_queues =0 ; + adapter->flags &= ~I40EVF_FLAG_REINIT_ITR_NEEDED ; } }break ;
include/linux/avf/virtchnl.h +2 -2
@@ -333,8 +333,8 @@ struct virtchnl_vsi_queue_config_info {* additional queues must be negotiated. This is a best effort request as it * is possible the PF does not have enough queues left to support the request. * If the PF cannot support the number requested it will respond with the -* maximum number it is able to support; otherwise it will respond with the -* number requested. +* maximum number it is able to support. If the request is successful, PF will +* then reset the VF to institute required changes. */ /* VF resource request */
Signature · 1 line
2.14.2
Bowers
PATCH v2 2/2 i40e/i40evf: don't trust VF to reset itself
Quoted 21 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alan Brady
Sent: Wednesday, October 11, 2017 2:50 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2 2/2 net-next] i40e/i40evf: don't trust VF to reset itselfWhen using 'ethtool -L' on a VF to change number of requested queues from PF, we shouldn't trust the VF to reset itself after making the request. Doing it that way opens the door for a potentially malicious VF to do nasty things to the PF which should never be the case.
This makes it such that after VF makes a successful request, PF will then reset the VF to institute required changes. Only if the request fails will PF send a message back to VF letting it know the request was unsuccessful.
Testing-hints:
There should be no real functional changes. This is simply hardening against a potentially malicious VF.
Quoted 8 lines
v2: remove extra commit tags
Signed-off-by Alan Brady <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 +++++++-- drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c | 7 +++---- include/linux/avf/virtchnl.h | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-)
Bowers
PATCH v2 1/2 i40e: fix link reporting
In reply to Alan BradyQuoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alan Brady
Sent: Wednesday, October 11, 2017 2:50 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2 1/2 net-next] i40e: fix link reportingWhen querying the NVM for supported
phy_types, on some firmware versions, we were failing to actually fill out thephy_typeswhich means ethtool wouldn't report any link types.
Quoted 8 lines
Testing-hints:
Check 'ethtool <iface>' if you have the right (wrong?) firmware. Without this patch, no link modes will be reported.Signed-off-by Alan Brady <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)