40GbE Intel Wired LAN Driver Updates 2022-01-07
Subsystems (3)
Tony Nguyen
maintainerThis series contains updates to i40e and iavf drivers.
Karen limits per VF MAC filters so that one VF does not consume all filters for i40e.
Jedrzej reduces busy wait time for admin queue calls for i40e.
Mateusz updates firmware versions to reflect new supported NVM images and renames an error to remove non-inclusive language for i40e.
Yang Li fixes a set but not used warning for i40e.
Jason Wang removes an unneeded variable for iavf.
---
v2: Dropped patch 2
The following are changes since commit c25af830ab2608ef1dd5e4dada702ce1437ea8e7:
sch_cake: revise Diffserv docs
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 40GbE
Jason Wang (1):
iavf: remove an unneeded variable
Jedrzej Jagielski (1):
i40e: Minimize amount of busy-waiting during AQ send
Karen Sornek (1):
i40e: Add ensurance of MacVlan resources for every trusted VF
Mateusz Palczewski (2):
i40e: Update FW API version
i40e: Remove non-inclusive language
Yang Li (1):
i40e: remove variables set but not used
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 29 ++++++++++++---- .../net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 +-- drivers/net/ethernet/intel/i40e/i40e_common.c | 15 ++++---- .../net/ethernet/intel/i40e/i40e_prototype.h | 14 +++++--- drivers/net/ethernet/intel/i40e/i40e_status.h | 2 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 34 ++++++++++++++++--- drivers/net/ethernet/intel/iavf/iavf_adminq.c | 4 +-- 7 files changed, 70 insertions(+), 32 deletions(-)
Signature · 1 line
2.31.1
Tony Nguyen
maintainerPATCH v2 1/6 i40e: Add ensurance of MacVlan resources for every trusted VF
From: Karen Sornek <[email protected]>
Trusted VF can use up every resource available, leaving nothing to other trusted VFs.
Introduce define, which calculates MacVlan resources available based on maximum available MacVlan resources, bare minimum for each VF and number of currently allocated VFs.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +29 -5
@@ -2704,12 +2704,21 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg) (u8 *)&stats, sizeof(stats)); } +#define I40E_MAX_MACVLAN_PER_HW 3072 +#define I40E_MAX_MACVLAN_PER_PF (num_ports) (I40E_MAX_MACVLAN_PER_HW / \ + (num_ports))/* If the VF is not trusted restrict the number of MAC/VLAN it can program * MAC filters: 16 for multicast, 1 for MAC, 1 for broadcast */ #define I40E_VC_MAX_MAC_ADDR_PER_VF (16 + 1 + 1)#define I40E_VC_MAX_VLAN_PER_VF 16 +#define I40E_VC_MAX_MACVLAN_PER_TRUSTED_VF (vf_num, num_ports) \ +({ typeof(vf_num) vf_num_ = (vf_num); \ + typeof(num_ports) num_ports_ = (num_ports); \ + ((I40E_MAX_MACVLAN_PER_PF(num_ports_) - vf_num_ * \ + I40E_VC_MAX_MAC_ADDR_PER_VF) / vf_num_) + \ + I40E_VC_MAX_MAC_ADDR_PER_VF; })/** * i40e_check_vf_permission * @vf: pointer to the VF info
@@ -2734,6 +2743,7 @@ static inline int i40e_check_vf_permission(struct i40e_vf *vf, {struct i40e_pf *pf = vf->pf;struct i40e_vsi *vsi = pf->vsi[vf->lan_vsi_idx]; +struct i40e_hw *hw = &pf->hw;int mac2add_cnt =0 ;int i;
@@ -2775,12 +2785,26 @@ static inline int i40e_check_vf_permission(struct i40e_vf *vf,* number of addresses. Check to make sure that the additions do not * push us over the limit. */ -if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps) && - (i40e_count_filters (vsi) + mac2add_cnt) > +if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps)) { +if ((i40e_count_filters (vsi) + mac2add_cnt) >I40E_VC_MAX_MAC_ADDR_PER_VF ) { -dev_err (&pf->pdev->dev, -"Cannot add more MAC addresses, VF is not trusted, switch the VF to trusted to add more functionality\n" ); -return -EPERM ; +dev_err (&pf->pdev->dev, +"Cannot add more MAC addresses, VF is not trusted, switch the VF to trusted to add more functionality\n" ); +return -EPERM ; + } +/* If this VF is trusted, it can use more resources than untrusted. +* However to ensure that every trusted VF has appropriate number of +* resources, divide whole pool of resources per port and then across +* all VFs. +*/ + }else { +if ((i40e_count_filters (vsi) + mac2add_cnt) > +I40E_VC_MAX_MACVLAN_PER_TRUSTED_VF (pf->num_alloc_vfs, + hw->num_ports)) { +dev_err (&pf->pdev->dev, +"Cannot add more MAC addresses, trusted VF exhausted it's resources\n" ); +return -EPERM ; + } }return 0 ; }
Signature · 1 line
2.31.1
Tony Nguyen
maintainerPATCH v2 2/6 i40e: Minimize amount of busy-waiting during AQ send
In reply to Tony NguyenFrom: Jedrzej Jagielski <[email protected]>
The i40e_asq_send_command will now use a non blocking usleep_range if possible (non-atomic context), instead of busy-waiting udelay. The usleep_range function uses hrtimers to provide better performance and removes the negative impact of busy-waiting in time-critical environments.
1. Rename i40e_asq_send_command to i40e_asq_send_command_atomic and add 5th parameter to inform if called from an atomic context. Call inside usleep_range (if non-atomic) or udelay (if atomic).
2. Change i40e_asq_send_command to invoke
i40e_asq_send_command_atomic(..., false).
3. Change two functions:
- i40e_aq_set_vsi_uc_promisc_on_vlan
- i40e_aq_set_vsi_mc_promisc_on_vlan
to explicitly use i40e_asq_send_command_atomic(..., true) instead of i40e_asq_send_command, as they use spinlocks and do some work in an atomic context.
All other calls to i40e_asq_send_command remain unchanged.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 29 ++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_common.c | 6 ++-- .../net/ethernet/intel/i40e/i40e_prototype.h | 14 +++++---- 3 files changed, 35 insertions(+), 14 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +22 -7
@@ -769,21 +769,22 @@ static bool i40e_asq_done(struct i40e_hw *hw) }/** -* i40e_asq_send_command - send command to Admin Queue +* i40e_asq_send_command_atomic - send command to Admin Queue * @hw: pointer to the hw struct * @desc: prefilled descriptor describing the command (non DMA mem) * @buff: buffer to use for indirect commands * @buff_size: size of buffer for indirect commands * @cmd_details: pointer to command details structure +* @is_atomic_context: is the function called in an atomic context? * * This is the main send command driver routine for the Admin Queue send * queue. It runs the queue, cleans the queue, etc **/ -i40e_status i40e_asq_send_command (struct i40e_hw *hw, -struct i40e_aq_desc *desc, -void *buff,/* can be NULL */ -u16 buff_size, -struct i40e_asq_cmd_details *cmd_details) +i40e_status +i40e_asq_send_command_atomic (struct i40e_hw *hw,struct i40e_aq_desc *desc, +void *buff,/* can be NULL */ u16 buff_size, +struct i40e_asq_cmd_details *cmd_details, +bool is_atomic_context) {i40e_status status =0 ;struct i40e_dma_mem *dma_buff =NULL ;
@@ -910,7 +911,12 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,*/ if (i40e_asq_done (hw))break ; -udelay (50 ); + +if (is_atomic_context) +udelay (50 ); +else +usleep_range (40 ,60 ); + total_delay +=50 ; }while (total_delay < hw->aq.asq_cmd_timeout); }
@@ -967,6 +973,15 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,return status; } +i40e_status +i40e_asq_send_command (struct i40e_hw *hw,struct i40e_aq_desc *desc, +void *buff,/* can be NULL */ u16 buff_size, +struct i40e_asq_cmd_details *cmd_details) +{ +return i40e_asq_send_command_atomic (hw, desc, buff, buff_size, + cmd_details, false); +} +/** * i40e_fill_default_direct_cmd_desc - AQ descriptor helper function * @desc: pointer to the temp descriptor (non DMA mem)
drivers/net/ethernet/intel/i40e/i40e_common.c +4 -2
@@ -2073,7 +2073,8 @@ enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw, cmd->seid =cpu_to_le16 (seid); cmd->vlan_tag =cpu_to_le16 (vid |I40E_AQC_SET_VSI_VLAN_VALID ); - status =i40e_asq_send_command (hw, &desc,NULL ,0 , cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc,NULL ,0 , + cmd_details, true);return status; }
@@ -2114,7 +2115,8 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, cmd->seid =cpu_to_le16 (seid); cmd->vlan_tag =cpu_to_le16 (vid |I40E_AQC_SET_VSI_VLAN_VALID ); - status =i40e_asq_send_command (hw, &desc,NULL ,0 , cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc,NULL ,0 , + cmd_details, true);return status; }
drivers/net/ethernet/intel/i40e/i40e_prototype.h +9 -5
@@ -22,11 +22,15 @@ void i40e_adminq_init_ring_data(struct i40e_hw *hw);i40e_status i40e_clean_arq_element (struct i40e_hw *hw,struct i40e_arq_event_info *e,u16 *events_pending); -i40e_status i40e_asq_send_command (struct i40e_hw *hw, -struct i40e_aq_desc *desc, -void *buff,/* can be NULL */ -u16 buff_size, -struct i40e_asq_cmd_details *cmd_details); +i40e_status +i40e_asq_send_command (struct i40e_hw *hw,struct i40e_aq_desc *desc, +void *buff,/* can be NULL */ u16 buff_size, +struct i40e_asq_cmd_details *cmd_details); +i40e_status +i40e_asq_send_command_atomic (struct i40e_hw *hw,struct i40e_aq_desc *desc, +void *buff,/* can be NULL */ u16 buff_size, +struct i40e_asq_cmd_details *cmd_details, +bool is_atomic_context);/* debug function for adminq */ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,
Signature · 1 line
2.31.1
Tony Nguyen
maintainerPATCH v2 3/6 i40e: Update FW API version
In reply to Tony NguyenFrom: Mateusz Palczewski <[email protected]>
Update FW API versions to the newest supported NVM images.
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +2 -2
@@ -11,8 +11,8 @@*/ #define I40E_FW_API_VERSION_MAJOR 0x0001 -#define I40E_FW_API_VERSION_MINOR_X722 0x0009 -#define I40E_FW_API_VERSION_MINOR_X710 0x0009 +#define I40E_FW_API_VERSION_MINOR_X722 0x000C +#define I40E_FW_API_VERSION_MINOR_X710 0x000F#define I40E_FW_MINOR_VERSION (_h) ((_h)->mac.type == I40E_MAC_XL710 ? \ I40E_FW_API_VERSION_MINOR_X710 : \
Signature · 1 line
2.31.1
Tony Nguyen
maintainerPATCH v2 4/6 i40e: Remove non-inclusive language
In reply to Tony NguyenFrom: Mateusz Palczewski <[email protected]>
Remove non-inclusive language from the driver.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 4 ++-- drivers/net/ethernet/intel/i40e/i40e_status.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +2 -2
@@ -154,8 +154,8 @@ const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err)return "I40E_ERR_INVALID_MAC_ADDR" ;case I40E_ERR_DEVICE_NOT_SUPPORTED :return "I40E_ERR_DEVICE_NOT_SUPPORTED" ; -case I40E_ERR_MASTER_REQUESTS_PENDING : -return "I40E_ERR_MASTER_REQUESTS_PENDING" ; +case I40E_ERR_PRIMARY_REQUESTS_PENDING : +return "I40E_ERR_PRIMARY_REQUESTS_PENDING" ;case I40E_ERR_INVALID_LINK_SETTINGS :return "I40E_ERR_INVALID_LINK_SETTINGS" ;case I40E_ERR_AUTONEG_NOT_COMPLETE :
drivers/net/ethernet/intel/i40e/i40e_status.h +1 -1
@@ -18,7 +18,7 @@ enum i40e_status_code {I40E_ERR_ADAPTER_STOPPED =-9 ,I40E_ERR_INVALID_MAC_ADDR =-10 ,I40E_ERR_DEVICE_NOT_SUPPORTED =-11 , -I40E_ERR_MASTER_REQUESTS_PENDING =-12 , +I40E_ERR_PRIMARY_REQUESTS_PENDING =-12 ,I40E_ERR_INVALID_LINK_SETTINGS =-13 ,I40E_ERR_AUTONEG_NOT_COMPLETE =-14 , I40E_ERR_RESET_FAILED = -15,
Signature · 1 line
2.31.1
Tony Nguyen
maintainerPATCH v2 5/6 i40e: remove variables set but not used
In reply to Tony NguyenFrom: Yang Li <[email protected]>
The code that uses variables pe_cntx_size and pe_filt_size has been removed, so they should be removed as well.
Eliminate the following clang warnings:drivers/net/ethernet/intel/i40e/i40e_common.c:4139:20:
warning: variable 'pe_filt_size' set but not used. drivers/net/ethernet/intel/i40e/i40e_common.c:4139:6:
warning: variable 'pe_cntx_size' set but not used.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +0 -5
@@ -4138,7 +4138,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, struct i40e_filter_control_settings *settings) {u32 fcoe_cntx_size, fcoe_filt_size; -u32 pe_cntx_size, pe_filt_size;u32 fcoe_fmax;u32 val;
@@ -4182,8 +4181,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw,case I40E_HASH_FILTER_SIZE_256K :case I40E_HASH_FILTER_SIZE_512K :case I40E_HASH_FILTER_SIZE_1M : - pe_filt_size =I40E_HASH_FILTER_BASE_SIZE ; - pe_filt_size <<= (u32 )settings->pe_filt_num;break ;default :return I40E_ERR_PARAM ;
@@ -4200,8 +4197,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw,case I40E_DMA_CNTX_SIZE_64K :case I40E_DMA_CNTX_SIZE_128K :case I40E_DMA_CNTX_SIZE_256K : - pe_cntx_size =I40E_DMA_CNTX_BASE_SIZE ; - pe_cntx_size <<= (u32 )settings->pe_cntx_num;break ;default :return I40E_ERR_PARAM ;
Signature · 1 line
2.31.1
Tony Nguyen
maintainerPATCH v2 6/6 iavf: remove an unneeded variable
In reply to Tony NguyenFrom: Jason Wang <[email protected]>
The variable ret_code' used for returning is never changed in function iavf_shutdown_adminq'. So that it can be removed and just return its initial value 0 at the end of `iavf_shutdown_adminq' function.
--- drivers/net/ethernet/intel/iavf/iavf_adminq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_adminq.c +1 -3
@@ -551,15 +551,13 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw)**/ enum iavf_status iavf_shutdown_adminq (struct iavf_hw *hw) { -enum iavf_status ret_code =0 ; -if (iavf_check_asq_alive (hw))iavf_aq_queue_shutdown (hw, true);iavf_shutdown_asq (hw);iavf_shutdown_arq (hw); -return ret_code; +return 0 ; }/**
Signature · 1 line
2.31.1
This series was applied to netdev/net-next.git (master) by Tony Nguyen <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Tony Nguyen <[email protected]>:
Quoted 8 lines · On Fri, 7 Jan 2022 09:56:58 -0800 you wrote:
This series contains updates to i40e and iavf drivers.
Karen limits per VF MAC filters so that one VF does not consume all filters for i40e.
Jedrzej reduces busy wait time for admin queue calls for i40e.
[...]
Here is the summary with links:
- [net-next,v2,1/6] i40e: Add ensurance of MacVlan resources for every trusted VF
https://git.kernel.org/netdev/net-next/c/cfb1d572c986 - [net-next,v2,2/6] i40e: Minimize amount of busy-waiting during AQ send https://git.kernel.org/netdev/net-next/c/ef39584ddb15 - [net-next,v2,3/6] i40e: Update FW API version https://git.kernel.org/netdev/net-next/c/9c83ca8a638d - [net-next,v2,4/6] i40e: Remove non-inclusive language https://git.kernel.org/netdev/net-next/c/17b33d431960 - [net-next,v2,5/6] i40e: remove variables set but not used https://git.kernel.org/netdev/net-next/c/a127adf2fc83 - [net-next,v2,6/6] iavf: remove an unneeded variable https://git.kernel.org/netdev/net-next/c/5322c68e588d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html