ice: implement SRIOV VF Active-Active LAG
Subsystems (2)
v2 cover ice: implement SRIOV VF Active-Active LAG
This is a 8 patch series to implement support for SRIOV VFs over an active-active link aggregate
Patch 1 cleans up void pointer casts
Patch 2 utilizes bool over u8 when appropriate
Patch 3 adds a driver prefix to a LAG define
Patch 4 pre-move a function to reduce delta in implementation patch Patch 5 Cleanup variable initialization in declaration block Patch 6 Cleanup capability parsing for LAG feature
Patch 7 Move duplicatde lag code into helper functions Patch 8 is the implementation of the new functionality
v2:
- add fix for situation where VF reset is called outside of bonding event
Dave Ertman (8):
ice: Remove casts on void pointers in LAG code
ice: replace u8 elements with bool where
ice: Add driver specific prefix to LAG defines
ice: move LAG function in code to prepare for
ice: Cleanup variable initialization in LAG code
ice: cleanup capabilities evaluation
ice: breakout common LAG code into helpers
ice: Implement support for SRIOV VFs across Active/Active bonds
drivers/net/ethernet/intel/ice/ice.h | 1 + .../net/ethernet/intel/ice/ice_adminq_cmd.h | 9 +- drivers/net/ethernet/intel/ice/ice_common.c | 19 +- drivers/net/ethernet/intel/ice/ice_common.h | 2 +- drivers/net/ethernet/intel/ice/ice_lag.c | 924 ++++++++++++++---- drivers/net/ethernet/intel/ice/ice_lag.h | 23 +- drivers/net/ethernet/intel/ice/ice_type.h | 6 +- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 19 +- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 23 +- 9 files changed, 804 insertions(+), 222 deletions(-)
Signature · 1 line
2.49.0
PATCH v2 1/8 ice: Remove casts on void pointers in LAG code
This series will be touching on the LAG code in the ice driver, to prevent moving or propagating casting on void pointers, clean them up first.
This also allows for moving the variable initialization into the variable declaration.
--- drivers/net/ethernet/intel/ice/ice_lag.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/net/ethernet/intel/ice/ice_lag.c +8 -16
@@ -321,7 +321,7 @@ ice_lag_cfg_drop_fltr(struct ice_lag *lag, bool add)static void ice_lag_cfg_pf_fltrs (struct ice_lag *lag,void *ptr) { -struct netdev_notifier_bonding_info *info; +struct netdev_notifier_bonding_info *info = ptr;struct netdev_bonding_info *bonding_info;struct net_device *event_netdev;struct device *dev;
@@ -331,7 +331,6 @@ ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr)if (event_netdev != lag->netdev)return ; - info = (struct netdev_notifier_bonding_info *)ptr; bonding_info = &info->bonding_info; dev =ice_pf_to_dev (lag->pf);
@@ -831,13 +830,12 @@ ice_lag_cfg_cp_fltr(struct ice_lag *lag, bool add)*/ static void ice_lag_info_event (struct ice_lag *lag,void *ptr) { -struct netdev_notifier_bonding_info *info; +struct netdev_notifier_bonding_info *info = ptr;struct netdev_bonding_info *bonding_info;struct net_device *event_netdev;const char *lag_netdev_name; event_netdev =netdev_notifier_info_to_dev (ptr); - info = ptr; lag_netdev_name =netdev_name (lag->netdev); bonding_info = &info->bonding_info;
@@ -1302,11 +1300,10 @@ static void ice_lag_init_feature_support_flag(struct ice_pf *pf)*/ static void ice_lag_changeupper_event (struct ice_lag *lag,void *ptr) { -struct netdev_notifier_changeupper_info *info; +struct netdev_notifier_changeupper_info *info = ptr;struct ice_lag *primary_lag;struct net_device *netdev; - info = ptr; netdev =netdev_notifier_info_to_dev (ptr);/* not for this netdev */
@@ -1366,7 +1363,7 @@ static void ice_lag_changeupper_event(struct ice_lag *lag, void *ptr)*/ static void ice_lag_monitor_link (struct ice_lag *lag,void *ptr) { -struct netdev_notifier_changeupper_info *info; +struct netdev_notifier_changeupper_info *info = ptr;struct ice_hw *prim_hw, *active_hw;struct net_device *event_netdev;struct ice_pf *pf;
@@ -1383,7 +1380,6 @@ static void ice_lag_monitor_link(struct ice_lag *lag, void *ptr) prim_hw = &pf->hw; prim_port = prim_hw->port_info->lport; - info = (struct netdev_notifier_changeupper_info *)ptr;if (info->upper_dev != lag->upper_netdev)return ;
@@ -1412,8 +1408,8 @@ static void ice_lag_monitor_link(struct ice_lag *lag, void *ptr)*/ static void ice_lag_monitor_active (struct ice_lag *lag,void *ptr) { +struct netdev_notifier_bonding_info *info = ptr;struct net_device *event_netdev, *event_upper; -struct netdev_notifier_bonding_info *info;struct netdev_bonding_info *bonding_info;struct ice_netdev_priv *event_np;struct ice_pf *pf, *event_pf;
@@ -1438,7 +1434,6 @@ static void ice_lag_monitor_active(struct ice_lag *lag, void *ptr) event_port = event_pf->hw.port_info->lport; prim_port = pf->hw.port_info->lport; - info = (struct netdev_notifier_bonding_info *)ptr; bonding_info = &info->bonding_info;if (!bonding_info->slave.state) {
@@ -1485,8 +1480,8 @@ static void ice_lag_monitor_active(struct ice_lag *lag, void *ptr)static bool ice_lag_chk_comp (struct ice_lag *lag,void *ptr) { +struct netdev_notifier_bonding_info *info = ptr;struct net_device *event_netdev, *event_upper; -struct netdev_notifier_bonding_info *info;struct netdev_bonding_info *bonding_info;struct list_head *tmp;struct device *dev;
@@ -1512,7 +1507,6 @@ ice_lag_chk_comp(struct ice_lag *lag, void *ptr)return false; } - info = (struct netdev_notifier_bonding_info *)ptr; bonding_info = &info->bonding_info; lag->bond_mode = bonding_info->master.bond_mode;if (lag->bond_mode !=BOND_MODE_ACTIVEBACKUP ) {
@@ -1622,10 +1616,9 @@ ice_lag_unregister(struct ice_lag *lag, struct net_device *event_netdev)static void ice_lag_monitor_rdma (struct ice_lag *lag,void *ptr) { -struct netdev_notifier_changeupper_info *info; +struct netdev_notifier_changeupper_info *info = ptr;struct net_device *netdev; - info = ptr; netdev =netdev_notifier_info_to_dev (ptr);if (netdev != lag->netdev)
@@ -1795,9 +1788,8 @@ ice_lag_event_handler(struct notifier_block *notif_blk, unsigned long event, lag_work->lag = lag; lag_work->event = event;if (event ==NETDEV_CHANGEUPPER ) { -struct netdev_notifier_changeupper_info *info; +struct netdev_notifier_changeupper_info *info = ptr; - info = ptr; upper_netdev = info->upper_dev; }else { upper_netdev =netdev_master_upper_dev_get (netdev);
Signature · 1 line
2.49.0
PATCH v2 2/8 ice: replace u8 elements with bool where
In reply to Dave Ertmanappropriate
In preparation for the new LAG functionality implementation, there are a couple of existing LAG elements of the capabilities struct that should be bool instead of u8. Since we are adding a new element to this struct that should also be a bool, fix the existing LAG u8 in this patch and eliminate !! operators where possible.
--- drivers/net/ethernet/intel/ice/ice_common.c | 4 ++-- drivers/net/ethernet/intel/ice/ice_type.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +2 -2
@@ -2219,10 +2219,10 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, caps->reset_restrict_support);break ;case ICE_AQC_CAPS_FW_LAG_SUPPORT : - caps->roce_lag = !!(number &ICE_AQC_BIT_ROCEV2_LAG ); + caps->roce_lag = number &ICE_AQC_BIT_ROCEV2_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: roce_lag = %u\n" , prefix, caps->roce_lag); - caps->sriov_lag = !!(number &ICE_AQC_BIT_SRIOV_LAG ); + caps->sriov_lag = number &ICE_AQC_BIT_SRIOV_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: sriov_lag = %u\n" , prefix, caps->sriov_lag);break ;
drivers/net/ethernet/intel/ice/ice_type.h +3 -2
@@ -293,8 +293,9 @@ struct ice_hw_common_caps {u8 dcb;u8 ieee_1588;u8 rdma; -u8 roce_lag; -u8 sriov_lag; + +bool roce_lag; +bool sriov_lag;bool nvm_update_pending_nvm;bool nvm_update_pending_orom;
Signature · 1 line
2.49.0
Re: [Intel-wired-lan] [PATCH iwl-next v2 2/8] [PATCH iwl-next 2/8] ice: replace u8 elements with bool where
Quoted 51 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Dave Ertman
Sent: Tuesday, May 20, 2025 9:39 PM
To: [email protected]
Cc: Kitszel, Przemyslaw <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-next v2 2/8] [PATCH iwl-next 2/8] ice: replace u8 elements with bool whereappropriate
In preparation for the new LAG functionality implementation, there are a couple of existing LAG elements of the capabilities struct that should be bool instead of u8. Since we are adding a new element to this struct that should also be a bool, fix the existing LAG u8 in this patch and eliminate !! operators where possible.
Reviewed-by Przemek Kitszel <[email protected]>Signed-off-by Dave Ertman <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 4 ++-- drivers/net/ethernet/intel/ice/ice_type.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_common.c +2
-2@@ -2219,10 +2219,10 @@ ice_parse_common_caps(struct ice_hw *hw,struct ice_hw_common_caps *caps, caps->reset_restrict_support);break ;case ICE_AQC_CAPS_FW_LAG_SUPPORT : - caps->roce_lag = !!(number &ICE_AQC_BIT_ROCEV2_LAG ); + caps->roce_lag = number &ICE_AQC_BIT_ROCEV2_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: roce_lag = %u\n" , prefix, caps->roce_lag); - caps->sriov_lag = !!(number &ICE_AQC_BIT_SRIOV_LAG ); + caps->sriov_lag = number &ICE_AQC_BIT_SRIOV_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: sriov_lag = %u\n" , prefix, caps->sriov_lag);drivers/net/ethernet/intel/ice/ice_common.c +0
-0break ;drivers/net/ethernet/intel/ice/ice_type.h +0
-0
drivers/net/ethernet/intel/ice/ice_type.h struct ice_hw_common_caps { · line 298
Quoted 8 lines
drivers/net/ethernet/intel/ice/ice_type.h +3
-2@@ -293,8 +293,9 @@ struct ice_hw_common_caps {u8 dcb;u8 ieee_1588;u8 rdma; -u8 roce_lag; -u8 sriov_lag; + +bool roce_lag; +bool sriov_lag;
But why not u8 roce_lag:1; u8 sriov_lag:1; ?
Quoted 5 lines
drivers/net/ethernet/intel/ice/ice_type.h +0
-1bool nvm_update_pending_nvm;bool nvm_update_pending_orom; --2.49.0
Re: [Intel-wired-lan] [PATCH iwl-next v2 2/8] [PATCH iwl-next 2/8] ice: replace u8 elements with bool where
Quoted 61 lines
-----Original Message-----
From: Loktionov, Aleksandr <[email protected]>
Sent: Wednesday, May 21, 2025 11:19 AM
To: Ertman, David M <[email protected]>; intel-wired- [email protected]
Cc: Kitszel, Przemyslaw <[email protected]>
Subject: RE: [Intel-wired-lan] [PATCH iwl-next v2 2/8] [PATCH iwl-next 2/8]
ice: replace u8 elements with bool whereQuoted 50 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Dave Ertman
Sent: Tuesday, May 20, 2025 9:39 PM
To: [email protected]
Cc: Kitszel, Przemyslaw <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-next v2 2/8] [PATCH iwl-next 2/8] ice: replace u8 elements with bool whereappropriate
In preparation for the new LAG functionality implementation, there are a couple of existing LAG elements of the capabilities struct that should be bool instead of u8. Since we are adding a new element to this struct that should also be a bool, fix the existing LAG u8 in this patch and eliminate !! operators where possible.
Reviewed-by Przemek Kitszel <[email protected]>Signed-off-by Dave Ertman <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 4 ++-- drivers/net/ethernet/intel/ice/ice_type.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_common.c +2
-2@@ -2219,10 +2219,10 @@ ice_parse_common_caps(struct ice_hw *hw,struct ice_hw_common_caps *caps, caps->reset_restrict_support);break ;case ICE_AQC_CAPS_FW_LAG_SUPPORT : - caps->roce_lag = !!(number &ICE_AQC_BIT_ROCEV2_LAG ); + caps->roce_lag = number &ICE_AQC_BIT_ROCEV2_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: roce_lag = %u\n" , prefix, caps->roce_lag); - caps->sriov_lag = !!(number &ICE_AQC_BIT_SRIOV_LAG ); + caps->sriov_lag = number &ICE_AQC_BIT_SRIOV_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: sriov_lag = %u\n" , prefix, caps->sriov_lag);drivers/net/ethernet/intel/ice/ice_common.c +0
-0break ;drivers/net/ethernet/intel/ice/ice_type.h +0
-0@@ -293,8 +293,9 @@ struct ice_hw_common_caps {u8 dcb;
Quoted 8 lines
drivers/net/ethernet/intel/ice/ice_type.h struct ice_hw_common_caps { · line 298
Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_type.h +3
-2u8 ieee_1588;u8 rdma; -u8 roce_lag; -u8 sriov_lag; + +bool roce_lag; +bool sriov_lag;But why not u8 roce_lag:1; u8 sriov_lag:1; ?
This patch is the result of reviewer's comments and a request to change the u8's into bools. The change adds the benefit in that their usage can exclude !! operators when evaluating.
DaveE
Quoted 6 lines
Quoted 6 lines
drivers/net/ethernet/intel/ice/ice_type.h +0
-1bool nvm_update_pending_nvm;bool nvm_update_pending_orom; --2.49.0
PATCH v2 3/8 ice: Add driver specific prefix to LAG defines
In reply to Dave ErtmanA define in the LAG code is missing a driver specific prefix. Add a prefix to the define.
Also shorten a defines name and move to a more logical place.
--- drivers/net/ethernet/intel/ice/ice_lag.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/ice/ice_lag.c +9 -11
@@ -10,12 +10,14 @@#define ICE_LAG_RES_SHARED BIT(14)#define ICE_LAG_RES_VALID BIT(15) -#define LACP_TRAIN_PKT_LEN 16 -static const u8 lacp_train_pkt[LACP_TRAIN_PKT_LEN ] = {0 ,0 ,0 ,0 ,0 ,0 , -0 ,0 ,0 ,0 ,0 ,0 , -0x88 ,0x09 ,0 ,0 }; +#define ICE_TRAIN_PKT_LEN 16 +static const u8 lacp_train_pkt[ICE_TRAIN_PKT_LEN ] = {0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 , +0x88 ,0x09 ,0 ,0 };#define ICE_RECIPE_LEN 64 +#define ICE_LAG_SRIOV_CP_RECIPE 10 +static const u8 ice_dflt_vsi_rcp[ICE_RECIPE_LEN ] = {0x05 ,0 ,0 ,0 ,0x20 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0x85 ,0 ,0x01 ,0 ,0 ,0 ,0xff ,0xff ,0x08 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,
@@ -766,9 +768,6 @@ void ice_lag_move_vf_nodes_cfg(struct ice_lag *lag, u8 src_prt, u8 dst_prt)ice_lag_destroy_netdev_list (lag, &ndlist); } -#define ICE_LAG_SRIOV_CP_RECIPE 10 -#define ICE_LAG_SRIOV_TRAIN_PKT_LEN 16 -/** * ice_lag_cfg_cp_fltr - configure filter for control packets * @lag: local interface's lag struct
@@ -783,8 +782,7 @@ ice_lag_cfg_cp_fltr(struct ice_lag *lag, bool add) vsi = lag->pf->vsi[0 ]; - buf_len =ICE_SW_RULE_RX_TX_HDR_SIZE (s_rule, -ICE_LAG_SRIOV_TRAIN_PKT_LEN ); + buf_len =ICE_SW_RULE_RX_TX_HDR_SIZE (s_rule,ICE_TRAIN_PKT_LEN ); s_rule =kzalloc (buf_len,GFP_KERNEL );if (!s_rule) {netdev_warn (lag->netdev,"-ENOMEM error configuring CP filter\n" );
@@ -799,8 +797,8 @@ ice_lag_cfg_cp_fltr(struct ice_lag *lag, bool add)ICE_SINGLE_ACT_LAN_ENABLE |ICE_SINGLE_ACT_VALID_BIT | FIELD_PREP(ICE_SINGLE_ACT_VSI_ID_M, vsi->vsi_num)); - s_rule->hdr_len =cpu_to_le16 (ICE_LAG_SRIOV_TRAIN_PKT_LEN ); -memcpy (s_rule->hdr_data, lacp_train_pkt,LACP_TRAIN_PKT_LEN ); + s_rule->hdr_len =cpu_to_le16 (ICE_TRAIN_PKT_LEN ); +memcpy (s_rule->hdr_data, lacp_train_pkt,ICE_TRAIN_PKT_LEN ); opc = ice_aqc_opc_add_sw_rules; }else { opc = ice_aqc_opc_remove_sw_rules;
Signature · 1 line
2.49.0
PATCH v2 4/8 ice: move LAG function in code to prepare for
In reply to Dave ErtmanActive-Active
In the SRIOV LAG Active-Active, the function ice_lag_cfg_pf_fltr's content is moved to an earlier location in the source file. Along with this change, the function is renamed, and the flow is changed.
To reduce the delta in the larger patch, move the original function to its new location so that only functional changes are needed in the larger patch.
--- drivers/net/ethernet/intel/ice/ice_lag.c | 103 ++++++++++++----------- 1 file changed, 52 insertions(+), 51 deletions(-)
drivers/net/ethernet/intel/ice/ice_lag.c +52 -51
@@ -354,6 +354,58 @@ ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr) } } +/** +* ice_lag_cfg_cp_fltr - configure filter for control packets +* @lag: local interface's lag struct +* @add: add or remove rule +*/ +static void +ice_lag_cfg_cp_fltr (struct ice_lag *lag,bool add) +{ +struct ice_sw_rule_lkup_rx_tx *s_rule =NULL ; +struct ice_vsi *vsi; +u16 buf_len, opc; + + vsi = lag->pf->vsi[0 ]; + + buf_len =ICE_SW_RULE_RX_TX_HDR_SIZE (s_rule,ICE_TRAIN_PKT_LEN ); + s_rule =kzalloc (buf_len,GFP_KERNEL ); +if (!s_rule) { +netdev_warn (lag->netdev,"-ENOMEM error configuring CP filter\n" ); +return ; + } + +if (add) { + s_rule->hdr.type =cpu_to_le16 (ICE_AQC_SW_RULES_T_LKUP_RX ); + s_rule->recipe_id =cpu_to_le16 (ICE_LAG_SRIOV_CP_RECIPE ); + s_rule->src =cpu_to_le16 (vsi->port_info->lport); + s_rule->act =cpu_to_le32 (ICE_FWD_TO_VSI | +ICE_SINGLE_ACT_LAN_ENABLE | +ICE_SINGLE_ACT_VALID_BIT | +FIELD_PREP (ICE_SINGLE_ACT_VSI_ID_M , + vsi->vsi_num)); + s_rule->hdr_len =cpu_to_le16 (ICE_TRAIN_PKT_LEN ); +memcpy (s_rule->hdr_data, lacp_train_pkt,ICE_TRAIN_PKT_LEN ); + opc = ice_aqc_opc_add_sw_rules; + }else { + opc = ice_aqc_opc_remove_sw_rules; + s_rule->index =cpu_to_le16 (lag->cp_rule_idx); + } +if (ice_aq_sw_rules (&lag->pf->hw, s_rule, buf_len,1 , opc,NULL )) { +netdev_warn (lag->netdev,"Error %s CP rule for fail-over\n" , + add ?"ADDING" :"REMOVING" ); + goto err_cp_free; + } + +if (add) + lag->cp_rule_idx =le16_to_cpu (s_rule->index); +else + lag->cp_rule_idx =0 ; + +err_cp_free: +kfree (s_rule); +} +/** * ice_display_lag_info - print LAG info * @lag: LAG info struct
@@ -768,57 +820,6 @@ void ice_lag_move_vf_nodes_cfg(struct ice_lag *lag, u8 src_prt, u8 dst_prt)ice_lag_destroy_netdev_list (lag, &ndlist); } -/** -* ice_lag_cfg_cp_fltr - configure filter for control packets -* @lag: local interface's lag struct -* @add: add or remove rule -*/ -static void -ice_lag_cfg_cp_fltr (struct ice_lag *lag,bool add) -{ -struct ice_sw_rule_lkup_rx_tx *s_rule =NULL ; -struct ice_vsi *vsi; -u16 buf_len, opc; - - vsi = lag->pf->vsi[0 ]; - - buf_len =ICE_SW_RULE_RX_TX_HDR_SIZE (s_rule,ICE_TRAIN_PKT_LEN ); - s_rule =kzalloc (buf_len,GFP_KERNEL ); -if (!s_rule) { -netdev_warn (lag->netdev,"-ENOMEM error configuring CP filter\n" ); -return ; - } - -if (add) { - s_rule->hdr.type =cpu_to_le16 (ICE_AQC_SW_RULES_T_LKUP_RX ); - s_rule->recipe_id =cpu_to_le16 (ICE_LAG_SRIOV_CP_RECIPE ); - s_rule->src =cpu_to_le16 (vsi->port_info->lport); - s_rule->act =cpu_to_le32 (ICE_FWD_TO_VSI | -ICE_SINGLE_ACT_LAN_ENABLE | -ICE_SINGLE_ACT_VALID_BIT | -FIELD_PREP (ICE_SINGLE_ACT_VSI_ID_M , vsi->vsi_num)); - s_rule->hdr_len =cpu_to_le16 (ICE_TRAIN_PKT_LEN ); -memcpy (s_rule->hdr_data, lacp_train_pkt,ICE_TRAIN_PKT_LEN ); - opc = ice_aqc_opc_add_sw_rules; - }else { - opc = ice_aqc_opc_remove_sw_rules; - s_rule->index =cpu_to_le16 (lag->cp_rule_idx); - } -if (ice_aq_sw_rules (&lag->pf->hw, s_rule, buf_len,1 , opc,NULL )) { -netdev_warn (lag->netdev,"Error %s CP rule for fail-over\n" , - add ?"ADDING" :"REMOVING" ); - goto cp_free; - } - -if (add) - lag->cp_rule_idx =le16_to_cpu (s_rule->index); -else - lag->cp_rule_idx =0 ; - -cp_free: -kfree (s_rule); -} -/** * ice_lag_info_event - handle NETDEV_BONDING_INFO event * @lag: LAG info struct
Signature · 1 line
2.49.0
PATCH v2 5/8 ice: Cleanup variable initialization in LAG code
In reply to Dave ErtmanIn preparation for implementing SRIOV Active-Active LAG support, cleanup several unneeded variable initializations in declaration blocks.
Also move a couple of variable initializations into declaration block that shouold be there.
--- drivers/net/ethernet/intel/ice/ice_lag.c | 54 ++++++++---------------- 1 file changed, 17 insertions(+), 37 deletions(-)
drivers/net/ethernet/intel/ice/ice_lag.c +17 -37
@@ -212,13 +212,12 @@ ice_lag_cfg_fltr(struct ice_lag *lag, u32 act, u16 recipe_id, u16 *rule_idx, u8 direction, bool add) {struct ice_sw_rule_lkup_rx_tx *s_rule; +struct ice_hw *hw = &lag->pf->hw;u16 s_rule_sz, vsi_num; -struct ice_hw *hw;u8 *eth_hdr;u32 opc;int err; - hw = &lag->pf->hw; vsi_num =ice_get_hw_vsi_num (hw,0 ); s_rule_sz =ICE_SW_RULE_RX_TX_ETH_HDR_SIZE (s_rule);
@@ -362,12 +361,10 @@ ice_lag_cfg_pf_fltrs(struct ice_lag *lag, void *ptr)static void ice_lag_cfg_cp_fltr (struct ice_lag *lag,bool add) { -struct ice_sw_rule_lkup_rx_tx *s_rule =NULL ; -struct ice_vsi *vsi; +struct ice_sw_rule_lkup_rx_tx *s_rule; +struct ice_vsi *vsi = lag->pf->vsi[0 ];u16 buf_len, opc; - vsi = lag->pf->vsi[0 ]; - buf_len =ICE_SW_RULE_RX_TX_HDR_SIZE (s_rule,ICE_TRAIN_PKT_LEN ); s_rule =kzalloc (buf_len,GFP_KERNEL );if (!s_rule) {
@@ -455,12 +452,11 @@ static u16 ice_lag_qbuf_recfg(struct ice_hw *hw, struct ice_aqc_cfg_txqs_buf *qbuf, u16 vsi_num, u16 numq, u8 tc) { + struct ice_pf *pf = hw->back;struct ice_q_ctx *q_ctx;u16 qid, count =0 ; -struct ice_pf *pf;int i; - pf = hw->back;for (i =0 ; i < numq; i++) { q_ctx =ice_get_lan_q_ctx (hw, vsi_num, tc, i);if (!q_ctx) {
@@ -876,13 +872,12 @@ ice_lag_reclaim_vf_tc(struct ice_lag *lag, struct ice_hw *src_hw, u16 vsi_num,u16 numq, valq, num_moved, qbuf_size;u16 buf_size =__struct_size (buf);struct ice_aqc_cfg_txqs_buf *qbuf; +struct ice_hw *hw = &lag->pf->hw;struct ice_sched_node *n_prt;__le32 teid, parent_teid;struct ice_vsi_ctx *ctx; -struct ice_hw *hw;u32 tmp_teid; - hw = &lag->pf->hw; ctx =ice_get_vsi_ctx (hw, vsi_num);if (!ctx) {dev_warn (dev,"Unable to locate VSI context for LAG reclaim\n" );
@@ -1179,11 +1174,8 @@ ice_lag_set_swid(u16 primary_swid, struct ice_lag *local_lag,*/ static void ice_lag_primary_swid (struct ice_lag *lag,bool link) { -struct ice_hw *hw; -u16 swid; - - hw = &lag->pf->hw; - swid = hw->port_info->sw_id; +struct ice_hw *hw = &lag->pf->hw; +u16 swid = hw->port_info->sw_id;if (ice_share_res (hw,ICE_AQC_RES_TYPE_SWID , link, swid))dev_warn (ice_pf_to_dev (lag->pf),"Failure to set primary interface shared status\n" );
@@ -1196,12 +1188,10 @@ static void ice_lag_primary_swid(struct ice_lag *lag, bool link)*/ static void ice_lag_add_prune_list (struct ice_lag *lag,struct ice_pf *event_pf) { -u16 num_vsi, rule_buf_sz, vsi_list_id, event_vsi_num, prim_vsi_idx; -struct ice_sw_rule_vsi_list *s_rule =NULL ; +u16 rule_buf_sz, vsi_list_id, event_vsi_num, prim_vsi_idx, num_vsi =1 ; +struct ice_sw_rule_vsi_list *s_rule;struct device *dev; - num_vsi =1 ; - dev =ice_pf_to_dev (lag->pf); event_vsi_num = event_pf->vsi[0 ]->vsi_num; prim_vsi_idx = lag->pf->vsi[0 ]->idx;
@@ -1237,12 +1227,10 @@ static void ice_lag_add_prune_list(struct ice_lag *lag, struct ice_pf *event_pf)*/ static void ice_lag_del_prune_list (struct ice_lag *lag,struct ice_pf *event_pf) { -u16 num_vsi, vsi_num, vsi_idx, rule_buf_sz, vsi_list_id; -struct ice_sw_rule_vsi_list *s_rule =NULL ; +u16 vsi_num, vsi_idx, rule_buf_sz, vsi_list_id, num_vsi =1 ; +struct ice_sw_rule_vsi_list *s_rule;struct device *dev; - num_vsi =1 ; - dev =ice_pf_to_dev (lag->pf); vsi_num = event_pf->vsi[0 ]->vsi_num; vsi_idx = lag->pf->vsi[0 ]->idx;
@@ -1665,11 +1653,9 @@ static void ice_lag_chk_disabled_bond(struct ice_lag *lag, void *ptr)*/ static void ice_lag_disable_sriov_bond (struct ice_lag *lag) { -struct ice_netdev_priv *np; -struct ice_pf *pf; +struct ice_netdev_priv *np =netdev_priv (lag->netdev); +struct ice_pf *pf = np->vsi->back; - np =netdev_priv (lag->netdev); - pf = np->vsi->back;ice_clear_feature_support (pf,ICE_F_SRIOV_LAG ); }
@@ -1838,10 +1824,8 @@ ice_lag_event_handler(struct notifier_block *notif_blk, unsigned long event,*/ static int ice_register_lag_handler (struct ice_lag *lag) { +struct notifier_block *notif_blk = &lag->notif_block;struct device *dev =ice_pf_to_dev (lag->pf); -struct notifier_block *notif_blk; - - notif_blk = &lag->notif_block;if (!notif_blk->notifier_call) { notif_blk->notifier_call = ice_lag_event_handler;
@@ -1861,10 +1845,9 @@ static int ice_register_lag_handler(struct ice_lag *lag)*/ static void ice_unregister_lag_handler (struct ice_lag *lag) { +struct notifier_block *notif_blk = &lag->notif_block;struct device *dev =ice_pf_to_dev (lag->pf); -struct notifier_block *notif_blk; - notif_blk = &lag->notif_block;if (notif_blk->notifier_call) {unregister_netdevice_notifier (notif_blk);dev_dbg (dev,"LAG event handler unregistered\n" );
@@ -1926,13 +1909,12 @@ ice_lag_move_vf_nodes_tc_sync(struct ice_lag *lag, struct ice_hw *dest_hw,u16 numq, valq, num_moved, qbuf_size;u16 buf_size =__struct_size (buf);struct ice_aqc_cfg_txqs_buf *qbuf; +struct ice_hw *hw = &lag->pf->hw;struct ice_sched_node *n_prt;__le32 teid, parent_teid;struct ice_vsi_ctx *ctx; -struct ice_hw *hw;u32 tmp_teid; - hw = &lag->pf->hw; ctx =ice_get_vsi_ctx (hw, vsi_num);if (!ctx) {dev_warn (dev,"LAG rebuild failed after reset due to VSI Context failure\n" );
@@ -2123,9 +2105,7 @@ int ice_init_lag(struct ice_pf *pf)*/ void ice_deinit_lag (struct ice_pf *pf) { -struct ice_lag *lag; - - lag = pf->lag; +struct ice_lag *lag = pf->lag;if (!lag)return ;
Signature · 1 line
2.49.0
PATCH v2 6/8 ice: cleanup capabilities evaluation
In reply to Dave ErtmanWhen evaluating the capabilities field, the ICE_AQC_BIT_ROCEV2_LAG and ICE_AQC_BIT_SRIOV_LAG defines were both not using the BIT operator, instead simply setting a hex value that set the correct bits. While not inaccurate, this method is misleading, and when it is expanded in the following implementation it becomes even more confusing.
Switch to using the BIT() operator to clarify what is being checked.
--- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +2 -2
@@ -133,8 +133,8 @@ struct ice_aqc_list_caps_elem {#define ICE_AQC_CAPS_TX_SCHED_TOPO_COMP_MODE 0x0085#define ICE_AQC_CAPS_NAC_TOPOLOGY 0x0087#define ICE_AQC_CAPS_FW_LAG_SUPPORT 0x0092 -#define ICE_AQC_BIT_ROCEV2_LAG 0x01 -#define ICE_AQC_BIT_SRIOV_LAG 0x02 +#define ICE_AQC_BIT_ROCEV2_LAG BIT(0) +#define ICE_AQC_BIT_SRIOV_LAG BIT(1)u8 major_ver;u8 minor_ver;
Signature · 1 line
2.49.0
PATCH v2 7/8 ice: breakout common LAG code into helpers
In reply to Dave ErtmanIn the VF handling code, parts of the code for lag can be broken out into helper functions to reduce code duplication. This is will be especially helpful once the whole series is applied and A/A is implemented.
Break this code out into helper functions
--- drivers/net/ethernet/intel/ice/ice_lag.c | 42 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_lag.h | 2 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 19 ++------- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 23 ++-------- 4 files changed, 51 insertions(+), 35 deletions(-)
drivers/net/ethernet/intel/ice/ice_lag.c +42 -0
@@ -816,6 +816,48 @@ void ice_lag_move_vf_nodes_cfg(struct ice_lag *lag, u8 src_prt, u8 dst_prt)ice_lag_destroy_netdev_list (lag, &ndlist); } +/** +* ice_lag_prepare_vf_reset - helper to adjust vf lag for reset +* @lag: lag struct for interface that owns VF +* +* Context: must be called with the lag_mutex lock held. +* +* Return: active lport value or ICE_LAG_INVALID_PORT if nothing moved. +*/ +u8 ice_lag_prepare_vf_reset (struct ice_lag *lag) +{ +u8 pri_prt, act_prt =ICE_LAG_INVALID_PORT ; + +if (lag && lag->bonded && lag->primary && lag->upper_netdev) { + pri_prt = lag->pf->hw.port_info->lport; + act_prt = lag->active_port; +if (act_prt != pri_prt && act_prt !=ICE_LAG_INVALID_PORT ) +ice_lag_move_vf_nodes_cfg (lag, act_prt, pri_prt); +else + act_prt =ICE_LAG_INVALID_PORT ; + } + +return act_prt; +} + +/** +* ice_lag_complete_vf_reset - helper for lag after reset +* @lag: lag struct for primary interface +* @act_prt: which port should be active for lag +* +* Context: must be called while holding the lag_mutex. +*/ +void ice_lag_complete_vf_reset (struct ice_lag *lag,u8 act_prt) +{ +u8 pri_prt; + +if (lag && lag->bonded && lag->primary && + act_prt !=ICE_LAG_INVALID_PORT ) { + pri_prt = lag->pf->hw.port_info->lport; +ice_lag_move_vf_nodes_cfg (lag, pri_prt, act_prt); + } +} +/** * ice_lag_info_event - handle NETDEV_BONDING_INFO event * @lag: LAG info struct
drivers/net/ethernet/intel/ice/ice_lag.h +2 -0
@@ -70,4 +70,6 @@ void ice_deinit_lag(struct ice_pf *pf);void ice_lag_rebuild (struct ice_pf *pf);bool ice_lag_is_switchdev_running (struct ice_pf *pf);void ice_lag_move_vf_nodes_cfg (struct ice_lag *lag,u8 src_prt,u8 dst_prt); +u8 ice_lag_prepare_vf_reset (struct ice_lag *lag); +void ice_lag_complete_vf_reset (struct ice_lag *lag,u8 act_prt);#endif /* _ICE_LAG_H_ */
drivers/net/ethernet/intel/ice/ice_vf_lib.c +3 -16
@@ -859,16 +859,13 @@ static void ice_notify_vf_reset(struct ice_vf *vf)int ice_reset_vf (struct ice_vf *vf,u32 flags) {struct ice_pf *pf = vf->pf; -struct ice_lag *lag;struct ice_vsi *vsi; -u8 act_prt, pri_prt;struct device *dev;int err =0 ; +u8 act_prt;bool rsd; dev =ice_pf_to_dev (pf); - act_prt =ICE_LAG_INVALID_PORT ; - pri_prt = pf->hw.port_info->lport;if (flags &ICE_VF_RESET_NOTIFY )ice_notify_vf_reset (vf);
@@ -884,16 +881,8 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)else lockdep_assert_held (&vf->cfg_lock); - lag = pf->lag;mutex_lock (&pf->lag_mutex); -if (lag && lag->bonded && lag->primary) { - act_prt = lag->active_port; -if (act_prt != pri_prt && act_prt !=ICE_LAG_INVALID_PORT && - lag->upper_netdev) -ice_lag_move_vf_nodes_cfg (lag, act_prt, pri_prt); -else - act_prt =ICE_LAG_INVALID_PORT ; - } + act_prt =ice_lag_prepare_vf_reset (pf->lag);if (ice_is_vf_disabled (vf)) { vsi =ice_get_vf_vsi (vf);
@@ -979,9 +968,7 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)ice_reset_vf_mbx_cnt (vf); out_unlock: -if (lag && lag->bonded && lag->primary && - act_prt !=ICE_LAG_INVALID_PORT ) -ice_lag_move_vf_nodes_cfg (lag, pri_prt, act_prt); +ice_lag_complete_vf_reset (pf->lag, act_prt);mutex_unlock (&pf->lag_mutex);if (flags &ICE_VF_RESET_LOCK )
drivers/net/ethernet/intel/ice/ice_virtchnl.c +4 -19
@@ -1997,24 +1997,13 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) (struct virtchnl_vsi_queue_config_info *)msg;struct virtchnl_queue_pair_info *qpi;struct ice_pf *pf = vf->pf; -struct ice_lag *lag;struct ice_vsi *vsi; -u8 act_prt, pri_prt;int i =-1 , q_idx;bool ena_ts; +u8 act_prt; - lag = pf->lag;mutex_lock (&pf->lag_mutex); - act_prt =ICE_LAG_INVALID_PORT ; - pri_prt = pf->hw.port_info->lport; -if (lag && lag->bonded && lag->primary) { - act_prt = lag->active_port; -if (act_prt != pri_prt && act_prt !=ICE_LAG_INVALID_PORT && - lag->upper_netdev) -ice_lag_move_vf_nodes_cfg (lag, act_prt, pri_prt); -else - act_prt =ICE_LAG_INVALID_PORT ; - } + act_prt =ice_lag_prepare_vf_reset (pf->lag);if (!test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) goto error_param;
@@ -2142,9 +2131,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) } } -if (lag && lag->bonded && lag->primary && - act_prt !=ICE_LAG_INVALID_PORT ) -ice_lag_move_vf_nodes_cfg (lag, pri_prt, act_prt); +ice_lag_complete_vf_reset (pf->lag, act_prt);mutex_unlock (&pf->lag_mutex);/* send the response to the VF */
@@ -2161,9 +2148,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) vf->vf_id, i); } -if (lag && lag->bonded && lag->primary && - act_prt !=ICE_LAG_INVALID_PORT ) -ice_lag_move_vf_nodes_cfg (lag, pri_prt, act_prt); +ice_lag_complete_vf_reset (pf->lag, act_prt);mutex_unlock (&pf->lag_mutex);ice_lag_move_new_vf_nodes (vf);
Signature · 1 line
2.49.0
PATCH v2 8/8 ice: Implement support for SRIOV VFs across Active/Active bonds
In reply to Dave ErtmanThis patch implements the software flows to handle SRIOV VF communication across an Active/Active link aggregate. The same restrictions apply as are in place for the support of Active/Backup bonds.
- the two interfaces must be on the same NIC
- the FW LLDP engine needs to be disabled
- the DDP package that supports VF LAG must be loaded on device
- the two interfaces must have the same QoS config
- only the first interface added to the bond will have VF support
- the interface with VFs must be in switchdev mode
With the additional requirement of
- the version of the FW on the NIC needs to have VF Active/Active support This requirement is indicated in the capabilities struct associated with the NVM loaded on the NIC.
The balancing of traffic between the two interfaces is done on a queue basis. Taking the queues allocated to all of the VFs as a whole, one half of them will be distributed to each interface. When a link goes down, then the queues allocated to the down interface will migrate to the active port. When the down port comes back up, then the same queues as were originally assigned there will be moved back.
As of this patch, all bonding modes are allowed for VF communication.
--- drivers/net/ethernet/intel/ice/ice.h | 1 + .../net/ethernet/intel/ice/ice_adminq_cmd.h | 5 + drivers/net/ethernet/intel/ice/ice_common.c | 15 +- drivers/net/ethernet/intel/ice/ice_common.h | 2 +- drivers/net/ethernet/intel/ice/ice_lag.c | 759 +++++++++++++++--- drivers/net/ethernet/intel/ice/ice_lag.h | 21 +- drivers/net/ethernet/intel/ice/ice_type.h | 1 + 7 files changed, 699 insertions(+), 105 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +1 -0
@@ -207,6 +207,7 @@ enum ice_feature {ICE_F_GCS ,ICE_F_ROCE_LAG ,ICE_F_SRIOV_LAG , +ICE_F_SRIOV_AA_LAG ,ICE_F_MBX_LIMIT , ICE_F_MAX };
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +5 -0
@@ -135,6 +135,7 @@ struct ice_aqc_list_caps_elem {#define ICE_AQC_CAPS_FW_LAG_SUPPORT 0x0092#define ICE_AQC_BIT_ROCEV2_LAG BIT(0)#define ICE_AQC_BIT_SRIOV_LAG BIT(1) +#define ICE_AQC_BIT_SRIOV_AA_LAG BIT(2)u8 major_ver;u8 minor_ver;
@@ -2167,6 +2168,10 @@ struct ice_aqc_cfg_txqs {#define ICE_AQC_Q_CFG_SRC_PRT_M 0x7#define ICE_AQC_Q_CFG_DST_PRT_S 3#define ICE_AQC_Q_CFG_DST_PRT_M (0x7 << ICE_AQC_Q_CFG_DST_PRT_S) +#define ICE_AQC_Q_CFG_MODE_M GENMASK(7, 6) +#define ICE_AQC_Q_CFG_MODE_SAME_PF 0x0 +#define ICE_AQC_Q_CFG_MODE_GIVE_OWN 0x1 +#define ICE_AQC_Q_CFG_MODE_KEEP_OWN 0x2u8 time_out;#define ICE_AQC_Q_CFG_TIMEOUT_S 2#define ICE_AQC_Q_CFG_TIMEOUT_M (0x1F << ICE_AQC_Q_CFG_TIMEOUT_S)
drivers/net/ethernet/intel/ice/ice_common.c +10 -5
@@ -2225,6 +2225,9 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, caps->sriov_lag = number &ICE_AQC_BIT_SRIOV_LAG ;ice_debug (hw,ICE_DBG_INIT ,"%s: sriov_lag = %u\n" , prefix, caps->sriov_lag); + caps->sriov_aa_lag = number &ICE_AQC_BIT_SRIOV_AA_LAG ; +ice_debug (hw,ICE_DBG_INIT ,"%s: sriov_aa_lag = %u\n" , + prefix, caps->sriov_aa_lag);break ;case ICE_AQC_CAPS_TX_SCHED_TOPO_COMP_MODE : caps->tx_sched_topo_comp_mode_en = (number ==1 );
@@ -4519,24 +4522,24 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps, }/** -* ice_aq_cfg_lan_txq +* ice_aq_cfg_lan_txq - send AQ command 0x0C32 to FW * @hw: pointer to the hardware structure * @buf: buffer for command * @buf_size: size of buffer in bytes * @num_qs: number of queues being configured * @oldport: origination lport * @newport: destination lport +* @mode: cmd_type for move to use * @cd: pointer to command details structure or NULL * * Move/Configure LAN Tx queue (0x0C32) * -* There is a better AQ command to use for moving nodes, so only coding -* this one for configuring the node. +* Return: Zero on success, associated error code on failure. */ int ice_aq_cfg_lan_txq (struct ice_hw *hw,struct ice_aqc_cfg_txqs_buf *buf,u16 buf_size,u16 num_qs,u8 oldport,u8 newport, -struct ice_sq_cd *cd) +u8 mode,struct ice_sq_cd *cd) {struct ice_aqc_cfg_txqs *cmd;struct ice_aq_desc desc;
@@ -4549,10 +4552,12 @@ ice_aq_cfg_lan_txq(struct ice_hw *hw, struct ice_aqc_cfg_txqs_buf *buf,if (!buf)return -EINVAL ; - cmd->cmd_type =ICE_AQC_Q_CFG_TC_CHNG ; + cmd->cmd_type = mode; cmd->num_qs = num_qs; cmd->port_num_chng = (oldport &ICE_AQC_Q_CFG_SRC_PRT_M ); cmd->port_num_chng |=FIELD_PREP (ICE_AQC_Q_CFG_DST_PRT_M , newport); + cmd->port_num_chng |=FIELD_PREP (ICE_AQC_Q_CFG_MODE_M , +ICE_AQC_Q_CFG_MODE_KEEP_OWN ); cmd->time_out =FIELD_PREP (ICE_AQC_Q_CFG_TIMEOUT_M ,5 ); cmd->blocked_cgds =0 ;
drivers/net/ethernet/intel/ice/ice_common.h +1 -1
@@ -223,7 +223,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,int ice_aq_cfg_lan_txq (struct ice_hw *hw,struct ice_aqc_cfg_txqs_buf *buf,u16 buf_size,u16 num_qs,u8 oldport,u8 newport, -struct ice_sq_cd *cd); +u8 mode,struct ice_sq_cd *cd);int ice_replay_vsi (struct ice_hw *hw,u16 vsi_handle);void ice_replay_post (struct ice_hw *hw); struct ice_q_ctx *
drivers/net/ethernet/intel/ice/ice_lag.c +661 -98
1,028 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_lag.h +20 -1
@@ -14,7 +14,11 @@ enum ice_lag_role { ICE_LAG_UNSET }; -#define ICE_LAG_INVALID_PORT 0xFF +#define ICE_LAG_INVALID_PORT 0xFF +#define ICE_LAGP_IDX 0 +#define ICE_LAGS_IDX 1 +#define ICE_LAGP_M 0x1 +#define ICE_LAGS_M 0x2#define ICE_LAG_RESET_RETRIES 5#define ICE_SW_DEFAULT_PROFILE 0
@@ -41,12 +45,26 @@ struct ice_lag {u8 active_port;/* lport value for the current active port */ u8 bonded:1; /* currently bonded */ u8 primary:1; /* this is primary */ + u8 bond_aa:1; /* is this bond active-active */ + u8 need_fltr_cfg:1; /* fltrs for A/A bond still need to be make */ + u8 port_bitmap:2; /* bitmap of active ports */ +u8 bond_lport_pri;/* lport values for primary PF */ +u8 bond_lport_sec;/* lport values for secondary PF */ + +/* q_home keeps track of which interface the q is currently on */ +u8 q_home[ICE_MAX_SRIOV_VFS ][ICE_MAX_RSS_QS_PER_VF ]; + +/* placeholder VSI for hanging VF queues from on secondary interface */ +struct ice_vsi *sec_vf[ICE_MAX_SRIOV_VFS ]; +u16 pf_recipe;u16 lport_recipe; +u16 act_act_recipe;u16 pf_rx_rule_id;u16 pf_tx_rule_id;u16 cp_rule_idx;u16 lport_rule_idx; +u16 act_act_rule_idx;u8 role; };
@@ -65,6 +83,7 @@ struct ice_lag_work { };void ice_lag_move_new_vf_nodes (struct ice_vf *vf); +void ice_lag_aa_failover (struct ice_lag *lag,u8 dest,struct ice_pf *e_pf);int ice_init_lag (struct ice_pf *pf);void ice_deinit_lag (struct ice_pf *pf);void ice_lag_rebuild (struct ice_pf *pf);
drivers/net/ethernet/intel/ice/ice_type.h +1 -0
@@ -296,6 +296,7 @@ struct ice_hw_common_caps {bool roce_lag;bool sriov_lag; +bool sriov_aa_lag;bool nvm_update_pending_nvm;bool nvm_update_pending_orom;
Signature · 1 line
2.49.0