i40e: cleanups & refactors
Subsystems (3)
v4 cover i40e: cleanups & refactors
This series do following:
Patch 1 - Removes write-only flags field from i40e_veb structure and
from i40e_veb_setup() parameters
Patch 2 - Refactors parameter of i40e_notify_client_of_l2_param_changes()
and i40e_notify_client_of_netdev_close()
Patch 3 - Refactors parameter of i40e_detect_recover_hung() Patch 4 - Adds helper i40e_pf_get_main_vsi() to get main VSI and uses it
in existing code
Patch 5 - Consolidates checks whether given VSI is the main one Patch 6 - Adds helper i40e_pf_get_main_veb() to get main VEB and uses it
in existing code
Patch 7 - Adds helper i40e_vsi_reconfig_tc() to reconfigure TC for
particular and uses it to replace existing open-coded pieces
Note that this series should go directly to net-next as the IWL review and validation were already done.
Changes since v3:
- fixed new kdoc warnings
Changes since v2:
- resubmitted per Tony's request (no new kdoc errors were found)
- added existing reviewed-by and tested-by tags Changes since v1:
- adjusted titles for patches 2 & 3
Ivan Vecera (7):
i40e: Remove flags field from i40e_veb
i40e: Refactor argument of several client notification functions
i40e: Refactor argument of i40e_detect_recover_hung()
i40e: Add helper to access main VSI
i40e: Consolidate checks whether given VSI is main
i40e: Add helper to access main VEB
i40e: Add and use helper to reconfigure TC for given VSI
drivers/net/ethernet/intel/i40e/i40e.h | 29 ++- drivers/net/ethernet/intel/i40e/i40e_client.c | 28 +-- drivers/net/ethernet/intel/i40e/i40e_ddp.c | 3 +- .../net/ethernet/intel/i40e/i40e_debugfs.c | 36 ++-- .../net/ethernet/intel/i40e/i40e_ethtool.c | 29 ++- drivers/net/ethernet/intel/i40e/i40e_main.c | 200 ++++++++++-------- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- 10 files changed, 211 insertions(+), 152 deletions(-)
Signature · 1 line
2.43.2
PATCH v4 1/7 i40e: Remove flags field from i40e_veb
The field is initialized always to zero and it is never read. Remove it.
--- drivers/net/ethernet/intel/i40e/i40e.h | 3 +-- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +++++-------- 3 files changed, 7 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +1 -2
@@ -788,7 +788,6 @@ struct i40e_veb {u16 stats_idx;/* index of VEB parent */ u8 enabled_tc;u16 bridge_mode;/* Bridge Mode (VEB/VEPA) */ -u16 flags;u16 bw_limit;u8 bw_max_quanta;bool is_abs_credits;
@@ -1213,7 +1212,7 @@ void i40e_vsi_stop_rings(struct i40e_vsi *vsi);void i40e_vsi_stop_rings_no_wait (struct i40e_vsi *vsi);int i40e_vsi_wait_queues_disabled (struct i40e_vsi *vsi);int i40e_reconfig_rss_queues (struct i40e_pf *pf,int queue_count); -struct i40e_veb *i40e_veb_setup (struct i40e_pf *pf,u16 flags,u16 uplink_seid, +struct i40e_veb *i40e_veb_setup (struct i40e_pf *pf,u16 uplink_seid,u16 downlink_seid,u8 enabled_tc);void i40e_veb_release (struct i40e_veb *veb);
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +1 -1
@@ -867,7 +867,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, goto command_write_done; } - veb =i40e_veb_setup (pf,0 , uplink_seid, vsi_seid, enabled_tc); + veb =i40e_veb_setup (pf, uplink_seid, vsi_seid, enabled_tc);if (veb)dev_info (&pf->pdev->dev,"added relay %d\n" , veb->seid);else
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -8
@@ -13127,7 +13127,7 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,/* Insert a new HW bridge */ if (!veb) { - veb =i40e_veb_setup (pf,0 , vsi->uplink_seid, vsi->seid, + veb =i40e_veb_setup (pf, vsi->uplink_seid, vsi->seid, vsi->tc_config.enabled_tc);if (veb) { veb->bridge_mode = mode;
@@ -14383,10 +14383,10 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, }if (vsi->uplink_seid == pf->mac_seid) - veb =i40e_veb_setup (pf,0 , pf->mac_seid, vsi->seid, + veb =i40e_veb_setup (pf, pf->mac_seid, vsi->seid, vsi->tc_config.enabled_tc);else if ((vsi->flags &I40E_VSI_FLAG_VEB_OWNER ) ==0 ) - veb =i40e_veb_setup (pf,0 , vsi->uplink_seid, vsi->seid, + veb =i40e_veb_setup (pf, vsi->uplink_seid, vsi->seid, vsi->tc_config.enabled_tc);if (veb) {if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) {
@@ -14780,7 +14780,6 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)/** * i40e_veb_setup - Set up a VEB * @pf: board private structure -* @flags: VEB setup flags * @uplink_seid: the switch element to link to * @vsi_seid: the initial VSI seid * @enabled_tc: Enabled TC bit-map
@@ -14793,9 +14792,8 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)* Returns pointer to the successfully allocated VEB sw struct on * success, otherwise returns NULL on failure. **/ -struct i40e_veb *i40e_veb_setup (struct i40e_pf *pf,u16 flags, -u16 uplink_seid,u16 vsi_seid, -u8 enabled_tc) +struct i40e_veb *i40e_veb_setup (struct i40e_pf *pf,u16 uplink_seid, +u16 vsi_seid,u8 enabled_tc) {struct i40e_vsi *vsi =NULL ;struct i40e_veb *veb;
@@ -14826,7 +14824,6 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags,if (veb_idx <0 ) goto err_alloc; veb = pf->veb[veb_idx]; - veb->flags = flags; veb->uplink_seid = uplink_seid; veb->enabled_tc = (enabled_tc ? enabled_tc :0x1 );
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 1/7] i40e: Remove flags field from i40e_veb
Quoted 9 lines · Ivan Vecera
The field is initialized always to zero and it is never read. Remove it.
Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Kalesh AP <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>
PATCH v4 2/7 i40e: Refactor argument of several client notification functions
In reply to Ivan VeceraCommit 0ef2d5afb12d ("i40e: KISS the client interface") simplified the client interface so in practice it supports only one client per i40e netdev. But we have still 2 notification functions that uses as parameter a pointer to VSI of netdevice associated with the client. After the mentioned commit only possible and used VSI is the main (LAN) VSI.
So refactor these functions so they are called with PF pointer argument and the associated VSI (LAN) is taken inside them.
--- drivers/net/ethernet/intel/i40e/i40e.h | 4 ++-- drivers/net/ethernet/intel/i40e/i40e_client.c | 20 +++++++++---------- drivers/net/ethernet/intel/i40e/i40e_main.c | 12 +++++------ 3 files changed, 17 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +2 -2
@@ -1236,8 +1236,8 @@ static inline void i40e_dbg_exit(void) {}int i40e_lan_add_device (struct i40e_pf *pf);int i40e_lan_del_device (struct i40e_pf *pf);void i40e_client_subtask (struct i40e_pf *pf); -void i40e_notify_client_of_l2_param_changes (struct i40e_vsi *vsi); -void i40e_notify_client_of_netdev_close (struct i40e_vsi *vsi,bool reset); +void i40e_notify_client_of_l2_param_changes (struct i40e_pf *pf); +void i40e_notify_client_of_netdev_close (struct i40e_pf *pf,bool reset);void i40e_notify_client_of_vf_enable (struct i40e_pf *pf,u32 num_vfs);void i40e_notify_client_of_vf_reset (struct i40e_pf *pf,u32 vf_id);void i40e_client_update_msix_info (struct i40e_pf *pf);
drivers/net/ethernet/intel/i40e/i40e_client.c +10 -10
@@ -101,25 +101,26 @@ i40e_notify_client_of_vf_msg(struct i40e_vsi *vsi, u32 vf_id, u8 *msg, u16 len)/** * i40e_notify_client_of_l2_param_changes - call the client notify callback -* @vsi: the VSI with l2 param changes +* @pf: PF device pointer * -* If there is a client to this VSI, call the client +* If there is a client, call its callback **/ -void i40e_notify_client_of_l2_param_changes (struct i40e_vsi *vsi) +void i40e_notify_client_of_l2_param_changes (struct i40e_pf *pf) { -struct i40e_pf *pf = vsi->back;struct i40e_client_instance *cdev = pf->cinst; +struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];struct i40e_params params;if (!cdev || !cdev->client)return ;if (!cdev->client->ops || !cdev->client->ops->l2_param_change) { -dev_dbg (&vsi->back->pdev->dev, +dev_dbg (&pf->pdev->dev,"Cannot locate client instance l2_param_change routine\n" );return ; }if (!test_bit (__I40E_CLIENT_INSTANCE_OPENED, &cdev->state)) { -dev_dbg (&vsi->back->pdev->dev,"Client is not open, abort l2 param change\n" ); +dev_dbg (&pf->pdev->dev, +"Client is not open, abort l2 param change\n" );return ; }memset (¶ms,0 ,sizeof (params));
@@ -157,20 +158,19 @@ static void i40e_client_release_qvlist(struct i40e_info *ldev)/** * i40e_notify_client_of_netdev_close - call the client close callback -* @vsi: the VSI with netdev closed +* @pf: PF device pointer * @reset: true when close called due to a reset pending * * If there is a client to this netdev, call the client with close **/ -void i40e_notify_client_of_netdev_close (struct i40e_vsi *vsi,bool reset) +void i40e_notify_client_of_netdev_close (struct i40e_pf *pf,bool reset) { -struct i40e_pf *pf = vsi->back;struct i40e_client_instance *cdev = pf->cinst;if (!cdev || !cdev->client)return ;if (!cdev->client->ops || !cdev->client->ops->close) { -dev_dbg (&vsi->back->pdev->dev, +dev_dbg (&pf->pdev->dev,"Cannot locate client instance close routine\n" );return ; }
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -7
@@ -11276,14 +11276,12 @@ static void i40e_service_task(struct work_struct *work)i40e_fdir_reinit_subtask (pf);if (test_and_clear_bit (__I40E_CLIENT_RESET, pf->state)) {/* Client subtask will reopen next time through. */ -i40e_notify_client_of_netdev_close (pf->vsi[pf->lan_vsi], - true); +i40e_notify_client_of_netdev_close (pf, true); }else {i40e_client_subtask (pf);if (test_and_clear_bit (__I40E_CLIENT_L2_CHANGE, pf->state)) -i40e_notify_client_of_l2_param_changes ( - pf->vsi[pf->lan_vsi]); +i40e_notify_client_of_l2_param_changes (pf); }i40e_sync_filters_subtask (pf); }else {
@@ -16217,7 +16215,7 @@ static void i40e_remove(struct pci_dev *pdev)/* Client close must be called explicitly here because the timer * has been stopped. */ -i40e_notify_client_of_netdev_close (pf->vsi[pf->lan_vsi], false); +i40e_notify_client_of_netdev_close (pf, false);i40e_fdir_teardown (pf);
@@ -16476,7 +16474,7 @@ static void i40e_shutdown(struct pci_dev *pdev)/* Client close must be called explicitly here because the timer * has been stopped. */ -i40e_notify_client_of_netdev_close (pf->vsi[pf->lan_vsi], false); +i40e_notify_client_of_netdev_close (pf, false);if (test_bit (I40E_HW_CAP_WOL_MC_MAGIC_PKT_WAKE , pf->hw.caps) && pf->wol_en)
@@ -16530,7 +16528,7 @@ static int i40e_suspend(struct device *dev)/* Client close must be called explicitly here because the timer * has been stopped. */ -i40e_notify_client_of_netdev_close (pf->vsi[pf->lan_vsi], false); +i40e_notify_client_of_netdev_close (pf, false);if (test_bit (I40E_HW_CAP_WOL_MC_MAGIC_PKT_WAKE , pf->hw.caps) && pf->wol_en)
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 2/7] i40e: Refactor argument of several client notification functions
Quoted 9 lines · Ivan Vecera
Commit
0ef2d5afb12d("i40e: KISS the client interface") simplified the client interface so in practice it supports only one client per i40e netdev. But we have still 2 notification functions that uses as parameter a pointer to VSI of netdevice associated with the client. After the mentioned commit only possible and used VSI is the main (LAN) VSI.
So refactor these functions so they are called with PF pointer argument and the associated VSI (LAN) is taken inside them.
Quoted 4 lines
Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>
PATCH v4 3/7 i40e: Refactor argument of i40e_detect_recover_hung()
In reply to Ivan VeceraCommit 07d44190a389 ("i40e/i40evf: Detect and recover hung queue scenario") changes i40e_detect_recover_hung() argument type from i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf. Because the i40evf does not exist anymore and the function is exclusively used by i40e we can revert this change.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 10 ++++++---- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -11267,7 +11267,7 @@ static void i40e_service_task(struct work_struct *work)return ;if (!test_bit (__I40E_RECOVERY_MODE, pf->state)) { -i40e_detect_recover_hung (pf->vsi[pf->lan_vsi]); +i40e_detect_recover_hung (pf);i40e_sync_filters_subtask (pf);i40e_reset_subtask (pf);i40e_handle_mdd_event (pf);
drivers/net/ethernet/intel/i40e/i40e_txrx.c +6 -4
@@ -861,13 +861,15 @@ u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw)/** * i40e_detect_recover_hung - Function to detect and recover hung_queues -* @vsi: pointer to vsi struct with tx queues +* @pf: pointer to PF struct * -* VSI has netdev and netdev has TX queues. This function is to check each of -* those TX queues if they are hung, trigger recovery by issuing SW interrupt. +* LAN VSI has netdev and netdev has TX queues. This function is to check +* each of those TX queues if they are hung, trigger recovery by issuing +* SW interrupt. **/ -void i40e_detect_recover_hung (struct i40e_vsi *vsi) +void i40e_detect_recover_hung (struct i40e_pf *pf) { +struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];struct i40e_ring *tx_ring =NULL ;struct net_device *netdev;unsigned int i;
drivers/net/ethernet/intel/i40e/i40e_txrx.h +1 -1
@@ -470,7 +470,7 @@ void i40e_free_rx_resources(struct i40e_ring *rx_ring);int i40e_napi_poll (struct napi_struct *napi,int budget);void i40e_force_wb (struct i40e_vsi *vsi,struct i40e_q_vector *q_vector);u32 i40e_get_tx_pending (struct i40e_ring *ring,bool in_sw); -void i40e_detect_recover_hung (struct i40e_vsi *vsi); +void i40e_detect_recover_hung (struct i40e_pf *pf);int __i40e_maybe_stop_tx (struct i40e_ring *tx_ring,int size);bool __i40e_chk_linearize (struct sk_buff *skb); int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 3/7] i40e: Refactor argument of i40e_detect_recover_hung()
Quoted 10 lines · Ivan Vecera
Commit
07d44190a389("i40e/i40evf: Detect and recover hung queue scenario") changesi40e_detect_recover_hung()argument type from i40e_pf* to i40e_vsi* to be shareable by both i40e and i40evf. Because the i40evf does not exist anymore and the function is exclusively used by i40e we can revert this change.Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>
PATCH v4 4/7 i40e: Add helper to access main VSI
In reply to Ivan VeceraAdd simple helper i40e_pf_get_main_vsi(pf) to access main VSI that replaces pattern 'pf->vsi[pf->lan_vsi]'
--- drivers/net/ethernet/intel/i40e/i40e.h | 11 ++ drivers/net/ethernet/intel/i40e/i40e_client.c | 10 +- drivers/net/ethernet/intel/i40e/i40e_ddp.c | 3 +- .../net/ethernet/intel/i40e/i40e_debugfs.c | 32 +++--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 8 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 107 ++++++++++-------- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 +- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 ++- 9 files changed, 116 insertions(+), 83 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +11 -0
@@ -1372,6 +1372,17 @@ i40e_pf_get_vsi_by_seid(struct i40e_pf *pf, u16 seid)return NULL ; } +/** +* i40e_pf_get_main_vsi - get pointer to main VSI +* @pf: pointer to a PF +* +* Return: pointer to main VSI or NULL if it does not exist +**/ +static inline struct i40e_vsi *i40e_pf_get_main_vsi (struct i40e_pf *pf) +{ +return (pf->lan_vsi !=I40E_NO_VSI ) ? pf->vsi[pf->lan_vsi] :NULL ; +} +/** * i40e_pf_get_veb_by_seid - find VEB by SEID * @pf: pointer to a PF
drivers/net/ethernet/intel/i40e/i40e_client.c +5 -5
@@ -107,8 +107,8 @@ i40e_notify_client_of_vf_msg(struct i40e_vsi *vsi, u32 vf_id, u8 *msg, u16 len)**/ void i40e_notify_client_of_l2_param_changes (struct i40e_pf *pf) { +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf);struct i40e_client_instance *cdev = pf->cinst; -struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];struct i40e_params params;if (!cdev || !cdev->client)
@@ -333,9 +333,9 @@ static int i40e_register_auxiliary_dev(struct i40e_info *ldev, const char *name)**/ static void i40e_client_add_instance (struct i40e_pf *pf) { +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf);struct i40e_client_instance *cdev =NULL ;struct netdev_hw_addr *mac =NULL ; -struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; cdev =kzalloc (sizeof (*cdev),GFP_KERNEL );if (!cdev)
@@ -399,9 +399,9 @@ void i40e_client_del_instance(struct i40e_pf *pf)**/ void i40e_client_subtask (struct i40e_pf *pf) { -struct i40e_client *client; +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf);struct i40e_client_instance *cdev; -struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; +struct i40e_client *client;int ret =0 ;if (!test_and_clear_bit (__I40E_CLIENT_SERVICE_REQUESTED, pf->state))
@@ -665,8 +665,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, bool is_vf, u32 vf_id, u32 flag, u32 valid_flag) { + struct i40e_vsi *vsi = i40e_pf_get_main_vsi(ldev->pf);struct i40e_pf *pf = ldev->pf; -struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];struct i40e_vsi_context ctxt;bool update = true;int err;
drivers/net/ethernet/intel/i40e/i40e_ddp.c +2 -1
@@ -407,8 +407,9 @@ static int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,**/ static int i40e_ddp_restore (struct i40e_pf *pf) { +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf); +struct net_device *netdev = vsi->netdev;struct i40e_ddp_old_profile_list *entry; -struct net_device *netdev = pf->vsi[pf->lan_vsi]->netdev;int status =0 ;if (!list_empty (&pf->ddp_old_prof)) {
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +18 -14
@@ -53,6 +53,7 @@ static ssize_t i40e_dbg_command_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { struct i40e_pf *pf = filp->private_data; +struct i40e_vsi *main_vsi;int bytes_not_copied;int buf_size =256 ;char *buf;
@@ -68,8 +69,8 @@ static ssize_t i40e_dbg_command_read(struct file *filp, char __user *buffer,if (!buf)return -ENOSPC ; - len =snprintf (buf, buf_size,"%s: %s\n" , - pf->vsi[pf->lan_vsi]->netdev->name, + main_vsi =i40e_pf_get_main_vsi (pf); + len =snprintf (buf, buf_size,"%s: %s\n" , main_vsi->netdev->name, i40e_dbg_command_buf); bytes_not_copied =copy_to_user (buffer, buf, len);
@@ -786,7 +787,8 @@ static ssize_t i40e_dbg_command_write(struct file *filp, cnt =sscanf (&cmd_buf[7 ],"%i" , &vsi_seid);if (cnt ==0 ) {/* default to PF VSI */ - vsi_seid = pf->vsi[pf->lan_vsi]->seid; + vsi =i40e_pf_get_main_vsi (pf); + vsi_seid = vsi->seid; }else if (vsi_seid <0 ) {dev_info (&pf->pdev->dev,"add VSI %d: bad vsi seid\n" , vsi_seid);
@@ -1030,7 +1032,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, goto command_write_done; } - vsi = pf->vsi[pf->lan_vsi]; + vsi =i40e_pf_get_main_vsi (pf); switch_id =le16_to_cpu (vsi->info.switch_id) &I40E_AQ_VSI_SW_ID_MASK ;
@@ -1380,6 +1382,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,dev_info (&pf->pdev->dev,"FD current total filter count for this interface: %d\n" ,i40e_get_current_fd_count (pf)); }else if (strncmp (cmd_buf,"lldp" ,4 ) ==0 ) { +/* Get main VSI */ +struct i40e_vsi *main_vsi =i40e_pf_get_main_vsi (pf); +if (strncmp (&cmd_buf[5 ],"stop" ,4 ) ==0 ) {int ret;
@@ -1391,10 +1396,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp, goto command_write_done; } ret =i40e_aq_add_rem_control_packet_filter (&pf->hw, - pf->hw.mac.addr, -ETH_P_LLDP ,0 , - pf->vsi[pf->lan_vsi]->seid, -0 , true,NULL ,NULL ); + pf->hw.mac.addr,ETH_P_LLDP ,0 , + main_vsi->seid,0 , true,NULL , +NULL );if (ret) { dev_info(&pf->pdev->dev, "%s: Add Control Packet Filter AQ command failed =0x%x\n",
@@ -1409,10 +1413,9 @@ static ssize_t i40e_dbg_command_write(struct file *filp,int ret; ret =i40e_aq_add_rem_control_packet_filter (&pf->hw, - pf->hw.mac.addr, -ETH_P_LLDP ,0 , - pf->vsi[pf->lan_vsi]->seid, -0 , false,NULL ,NULL ); + pf->hw.mac.addr,ETH_P_LLDP ,0 , + main_vsi->seid,0 , false,NULL , +NULL );if (ret) { dev_info(&pf->pdev->dev, "%s: Remove Control Packet Filter AQ command failed =0x%x\n",
@@ -1639,6 +1642,7 @@ static ssize_t i40e_dbg_netdev_ops_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { struct i40e_pf *pf = filp->private_data; +struct i40e_vsi *main_vsi;int bytes_not_copied;int buf_size =256 ;char *buf;
@@ -1654,8 +1658,8 @@ static ssize_t i40e_dbg_netdev_ops_read(struct file *filp, char __user *buffer,if (!buf)return -ENOSPC ; - len =snprintf (buf, buf_size,"%s: %s\n" , - pf->vsi[pf->lan_vsi]->netdev->name, + main_vsi =i40e_pf_get_main_vsi (pf); + len =snprintf (buf, buf_size,"%s: %s\n" , main_vsi->netdev->name, i40e_dbg_netdev_ops_buf); bytes_not_copied =copy_to_user (buffer, buf, len);
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +4 -4
@@ -2029,7 +2029,7 @@ static void i40e_get_ringparam(struct net_device *netdev, {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_pf *pf = np->vsi->back; -struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf); ring->rx_max_pending =i40e_get_max_num_descriptors (pf); ring->tx_max_pending =i40e_get_max_num_descriptors (pf);
@@ -3370,6 +3370,7 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_pf *pf,struct i40e_rx_flow_userdef userdef = {0 };struct i40e_fdir_filter *rule =NULL ;struct hlist_node *node2; +struct i40e_vsi *vsi;u64 input_set;u16 index;
@@ -3493,9 +3494,8 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_pf *pf, fsp->flow_type |=FLOW_EXT ; } -if (rule->dest_vsi != pf->vsi[pf->lan_vsi]->id) { -struct i40e_vsi *vsi; - + vsi =i40e_pf_get_main_vsi (pf); +if (rule->dest_vsi != vsi->id) { vsi =i40e_find_vsi_from_id (pf, rule->dest_vsi);if (vsi && vsi->type ==I40E_VSI_SRIOV ) {/* VFs are zero-indexed by the driver, but ethtool
drivers/net/ethernet/intel/i40e/i40e_main.c +60 -47
305 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_ptp.c +4 -2
@@ -1472,7 +1472,8 @@ void i40e_ptp_restore_hw_time(struct i40e_pf *pf)**/ void i40e_ptp_init (struct i40e_pf *pf) { -struct net_device *netdev = pf->vsi[pf->lan_vsi]->netdev; +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf); +struct net_device *netdev = vsi->netdev;struct i40e_hw *hw = &pf->hw;u32 pf_id;long err;
@@ -1536,6 +1537,7 @@ void i40e_ptp_init(struct i40e_pf *pf)**/ void i40e_ptp_stop (struct i40e_pf *pf) { +struct i40e_vsi *main_vsi =i40e_pf_get_main_vsi (pf);struct i40e_hw *hw = &pf->hw;u32 regval;
@@ -1555,7 +1557,7 @@ void i40e_ptp_stop(struct i40e_pf *pf)ptp_clock_unregister (pf->ptp_clock); pf->ptp_clock =NULL ;dev_info (&pf->pdev->dev,"%s: removed PHC on %s\n" , __func__, - pf->vsi[pf->lan_vsi]->netdev->name); + main_vsi->netdev->name); }if (i40e_is_ptp_pin_dev (&pf->hw)) {
drivers/net/ethernet/intel/i40e/i40e_txrx.c +4 -4
@@ -24,7 +24,7 @@ static void i40e_fdir(struct i40e_ring *tx_ring, {struct i40e_filter_program_desc *fdir_desc;struct i40e_pf *pf = tx_ring->vsi->back; -u32 flex_ptype, dtype_cmd; +u32 flex_ptype, dtype_cmd, vsi_id;u16 i;/* grab the next descriptor */
@@ -42,8 +42,8 @@ static void i40e_fdir(struct i40e_ring *tx_ring, flex_ptype |=FIELD_PREP (I40E_TXD_FLTR_QW0_PCTYPE_MASK , fdata->pctype);/* Use LAN VSI Id if not programmed by user */ - flex_ptype |=FIELD_PREP (I40E_TXD_FLTR_QW0_DEST_VSI_MASK , - fdata->dest_vsi ? : pf->vsi[pf->lan_vsi]->id); + vsi_id = fdata->dest_vsi ? :i40e_pf_get_main_vsi (pf)->id; + flex_ptype |=FIELD_PREP (I40E_TXD_FLTR_QW0_DEST_VSI_MASK , vsi_id); dtype_cmd =I40E_TX_DESC_DTYPE_FILTER_PROG ;
@@ -869,7 +869,7 @@ u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw)**/ void i40e_detect_recover_hung (struct i40e_pf *pf) { -struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; +struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf);struct i40e_ring *tx_ring =NULL ;struct net_device *netdev;unsigned int i;
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +8 -6
@@ -795,13 +795,13 @@ static int i40e_config_vsi_rx_queue(struct i40e_vf *vf, u16 vsi_id,static int i40e_alloc_vsi_res (struct i40e_vf *vf,u8 idx) {struct i40e_mac_filter *f =NULL ; +struct i40e_vsi *main_vsi, *vsi;struct i40e_pf *pf = vf->pf; -struct i40e_vsi *vsi;u64 max_tx_rate =0 ;int ret =0 ; - vsi =i40e_vsi_setup (pf,I40E_VSI_SRIOV , pf->vsi[pf->lan_vsi]->seid, - vf->vf_id); + main_vsi =i40e_pf_get_main_vsi (pf); + vsi =i40e_vsi_setup (pf,I40E_VSI_SRIOV , main_vsi->seid, vf->vf_id);if (!vsi) { dev_err(&pf->pdev->dev,
@@ -3322,8 +3322,9 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg)static int i40e_vc_rdma_msg (struct i40e_vf *vf,u8 *msg,u16 msglen) {struct i40e_pf *pf = vf->pf; -int abs_vf_id = vf->vf_id + pf->hw.func_caps.vf_base_id; +struct i40e_vsi *main_vsi;int aq_ret =0 ; +int abs_vf_id;if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states) || !test_bit (I40E_VF_STATE_RDMAENA , &vf->vf_states)) {
@@ -3331,8 +3332,9 @@ static int i40e_vc_rdma_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) goto error_param; } -i40e_notify_client_of_vf_msg (pf->vsi[pf->lan_vsi], abs_vf_id, - msg, msglen); + main_vsi =i40e_pf_get_main_vsi (pf); + abs_vf_id = vf->vf_id + pf->hw.func_caps.vf_base_id; +i40e_notify_client_of_vf_msg (main_vsi, abs_vf_id, msg, msglen); error_param:/* send the response to the VF */
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 4/7] i40e: Add helper to access main VSI
Quoted 7 lines · Ivan Vecera
Add simple helper
i40e_pf_get_main_vsi(pf)to access main VSI that replaces pattern 'pf->vsi[pf->lan_vsi]'Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>
PATCH v4 5/7 i40e: Consolidate checks whether given VSI is main
In reply to Ivan VeceraIn the driver code there are 3 types of checks whether given VSI is main or not:
1. vsi->type ==/!= I40E_VSI_MAIN
2. vsi ==/!= pf->vsi[pf->lan_vsi]
3. vsi->seid ==/!= pf->vsi[pf->lan_vsi]->seid
All of them are equivalent and can be consolidated. Convert cases 2 and 3 to case 1.
--- .../net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- .../net/ethernet/intel/i40e/i40e_ethtool.c | 12 ++++++------ drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +++++++++---------- 3 files changed, 16 insertions(+), 17 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +1 -1
@@ -129,7 +129,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)dev_info (&pf->pdev->dev," state[%d] = %08lx\n" , i, vsi->state[i]); -if (vsi == pf->vsi[pf->lan_vsi]) +if (vsi->type ==I40E_VSI_MAIN )dev_info (&pf->pdev->dev," MAC address: %pM Port MAC: %pM\n" , pf->hw.mac.addr, pf->hw.mac.port_addr);
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +6 -6
@@ -1241,7 +1241,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev,i40e_partition_setting_complaint (pf);return -EOPNOTSUPP ; } -if (vsi != pf->vsi[pf->lan_vsi]) +if (vsi->type !=I40E_VSI_MAIN )return -EOPNOTSUPP ; if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET && hw->phy.media_type != I40E_MEDIA_TYPE_FIBER &&
@@ -1710,7 +1710,7 @@ static int i40e_set_pauseparam(struct net_device *netdev,return -EOPNOTSUPP ; } -if (vsi != pf->vsi[pf->lan_vsi]) +if (vsi->type !=I40E_VSI_MAIN )return -EOPNOTSUPP ; is_an = hw_link_info->an_info &I40E_AQ_AN_COMPLETED ;
@@ -2292,7 +2292,7 @@ static int i40e_get_stats_count(struct net_device *netdev)struct i40e_pf *pf = vsi->back;int stats_len; -if (vsi == pf->vsi[pf->lan_vsi] && pf->hw.partition_id ==1 ) +if (vsi->type ==I40E_VSI_MAIN && pf->hw.partition_id ==1 ) stats_len =I40E_PF_STATS_LEN ;else stats_len =I40E_VSI_STATS_LEN ;
@@ -2422,7 +2422,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, }rcu_read_unlock (); -if (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id !=1 ) +if (vsi->type !=I40E_VSI_MAIN || pf->hw.partition_id !=1 ) goto check_data_pointer; veb_stats = ((pf->lan_veb != I40E_NO_VEB) &&
@@ -2495,7 +2495,7 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data) "rx", i); } -if (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id !=1 ) +if (vsi->type !=I40E_VSI_MAIN || pf->hw.partition_id !=1 ) goto check_data_pointer;i40e_add_stat_strings (&data, i40e_gstrings_veb_stats);
@@ -2792,7 +2792,7 @@ static int i40e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)return -EOPNOTSUPP ; } -if (vsi != pf->vsi[pf->lan_vsi]) +if (vsi->type !=I40E_VSI_MAIN )return -EOPNOTSUPP ;/* NVM bit on means WoL disabled for the port */
drivers/net/ethernet/intel/i40e/i40e_main.c +9 -10
@@ -990,7 +990,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi) ns->tx_dropped = es->tx_discards;/* pull in a couple PF stats if this is the main vsi */ -if (vsi == pf->vsi[pf->lan_vsi]) { +if (vsi->type ==I40E_VSI_MAIN ) { ns->rx_crc_errors = pf->stats.crc_errors; ns->rx_errors = pf->stats.crc_errors + pf->stats.illegal_bytes; ns->rx_length_errors = pf->stats.rx_length_errors;
@@ -1235,7 +1235,7 @@ void i40e_update_stats(struct i40e_vsi *vsi) {struct i40e_pf *pf = vsi->back; -if (vsi == pf->vsi[pf->lan_vsi]) +if (vsi->type ==I40E_VSI_MAIN )i40e_update_pf_stats (pf);i40e_update_vsi_stats (vsi);
@@ -6812,7 +6812,7 @@ static void i40e_dcb_reconfigure(struct i40e_pf *pf)/* - Enable all TCs for the LAN VSI * - For all others keep them at TC0 for now */ -if (v == pf->lan_vsi) +if (vsi->type ==I40E_VSI_MAIN ) tc_map =i40e_pf_get_tc_map (pf);else tc_map =I40E_DEFAULT_TRAFFIC_CLASS ;
@@ -9119,7 +9119,7 @@ int i40e_vsi_open(struct i40e_vsi *vsi)i40e_vsi_free_rx_resources (vsi); err_setup_tx:i40e_vsi_free_tx_resources (vsi); -if (vsi == pf->vsi[pf->lan_vsi]) +if (vsi->type ==I40E_VSI_MAIN )i40e_do_reset (pf,I40E_PF_RESET_FLAG , true);return err;
@@ -11994,7 +11994,7 @@ static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi)/* if not MSIX, give the one vector only to the LAN VSI */ if (test_bit (I40E_FLAG_MSIX_ENA , pf->flags)) num_q_vectors = vsi->num_q_vectors; -else if (vsi == pf->vsi[pf->lan_vsi]) +else if (vsi->type ==I40E_VSI_MAIN ) num_q_vectors =1 ;else return -EINVAL ;
@@ -13111,7 +13111,7 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,int rem;/* Only for PF VSI for now */ -if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) +if (vsi->type !=I40E_VSI_MAIN )return -EOPNOTSUPP ;/* Find the HW bridge for PF VSI */
@@ -13179,7 +13179,7 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,struct i40e_veb *veb;/* Only for PF VSI for now */ -if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) +if (vsi->type !=I40E_VSI_MAIN )return -EOPNOTSUPP ;/* Find the HW bridge for the PF VSI */
@@ -14131,8 +14131,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi) vsi->seid, vsi->uplink_seid);return -ENODEV ; } -if (vsi == pf->vsi[pf->lan_vsi] && - !test_bit (__I40E_DOWN, pf->state)) { +if (vsi->type ==I40E_VSI_MAIN && !test_bit (__I40E_DOWN, pf->state)) {dev_info (&pf->pdev->dev,"Can't remove PF VSI\n" );return -ENODEV ; }
@@ -14396,7 +14395,7 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, veb =i40e_veb_setup (pf, vsi->uplink_seid, vsi->seid, vsi->tc_config.enabled_tc);if (veb) { -if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) { +if (vsi->type !=I40E_VSI_MAIN ) {dev_info (&vsi->back->pdev->dev,"New VSI creation error, uplink seid of LAN VSI expected.\n" );return NULL ;
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 5/7] i40e: Consolidate checks whether given VSI is main
Quoted 6 lines · Ivan Vecera
In the driver code there are 3 types of checks whether given VSI is main or not:
1.vsi->type==/!=I40E_VSI_MAIN
2. vsi ==/!= pf->vsi[pf->lan_vsi]
3.vsi->seid==/!= pf->vsi[pf->lan_vsi]->seid
Quoted 7 lines
All of them are equivalent and can be consolidated. Convert cases 2 and 3 to case 1.
Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>
PATCH v4 6/7 i40e: Add helper to access main VEB
In reply to Ivan VeceraAdd a helper to access main VEB:
i40e_pf_get_main_veb(pf) replaces 'pf->veb[pf->lan_veb]'
--- drivers/net/ethernet/intel/i40e/i40e.h | 11 ++++++++ .../net/ethernet/intel/i40e/i40e_ethtool.c | 9 +++---- drivers/net/ethernet/intel/i40e/i40e_main.c | 27 ++++++++++++------- 3 files changed, 31 insertions(+), 16 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +11 -0
@@ -1401,4 +1401,15 @@ i40e_pf_get_veb_by_seid(struct i40e_pf *pf, u16 seid) return NULL; } +/** +* i40e_pf_get_main_veb - get pointer to main VEB +* @pf: pointer to a PF +* +* Return: pointer to main VEB or NULL if it does not exist +**/ +static inline struct i40e_veb *i40e_pf_get_main_veb (struct i40e_pf *pf) +{ +return (pf->lan_veb !=I40E_NO_VEB ) ? pf->veb[pf->lan_veb] :NULL ; +} +#endif /* _I40E_H_ */
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +3 -6
@@ -2425,14 +2425,11 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,if (vsi->type !=I40E_VSI_MAIN || pf->hw.partition_id !=1 ) goto check_data_pointer; - veb_stats = ((pf->lan_veb !=I40E_NO_VEB ) && - (pf->lan_veb <I40E_MAX_VEB ) && -test_bit (I40E_FLAG_VEB_STATS_ENA , pf->flags)); + veb =i40e_pf_get_main_veb (pf); + veb_stats = veb &&test_bit (I40E_FLAG_VEB_STATS_ENA , pf->flags); -if (veb_stats) { - veb = pf->veb[pf->lan_veb]; +if (veb_stats)i40e_update_veb_stats (veb); - }/* If veb stats aren't enabled, pass NULL instead of the veb so that * we initialize stats to zero and update the data pointer
drivers/net/ethernet/intel/i40e/i40e_main.c +17 -10
@@ -2481,7 +2481,7 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)int aq_ret;if (vsi->type ==I40E_VSI_MAIN && - pf->lan_veb !=I40E_NO_VEB && +i40e_pf_get_main_veb (pf) && !test_bit (I40E_FLAG_MFP_ENA , pf->flags)) {/* set defport ON for Main VSI instead of true promisc * this way we will get all unicast/multicast and VLAN
@@ -9909,6 +9909,7 @@ static void i40e_veb_link_event(struct i40e_veb *veb, bool link_up)static void i40e_link_event (struct i40e_pf *pf) {struct i40e_vsi *vsi =i40e_pf_get_main_vsi (pf); +struct i40e_veb *veb =i40e_pf_get_main_veb (pf);u8 new_link_speed, old_link_speed;bool new_link, old_link;int status;
@@ -9948,8 +9949,8 @@ static void i40e_link_event(struct i40e_pf *pf)/* Notify the base of the switch tree connected to * the link. Floating VEBs are not notified. */ -if (pf->lan_veb <I40E_MAX_VEB && pf->veb[pf->lan_veb]) -i40e_veb_link_event (pf->veb[pf->lan_veb], new_link); +if (veb) +i40e_veb_link_event (veb, new_link);else i40e_vsi_link_event (vsi, new_link);
@@ -14881,7 +14882,8 @@ static void i40e_setup_pf_switch_element(struct i40e_pf *pf,/* Main VEB? */ if (uplink_seid != pf->mac_seid)break ; -if (pf->lan_veb >=I40E_MAX_VEB ) { + veb =i40e_pf_get_main_veb (pf); +if (!veb) {int v;/* find existing or else empty VEB */
@@ -14895,12 +14897,15 @@ static void i40e_setup_pf_switch_element(struct i40e_pf *pf, pf->lan_veb = v; } } -if (pf->lan_veb >=I40E_MAX_VEB ) + +/* Try to get again main VEB as pf->lan_veb may have changed */ + veb =i40e_pf_get_main_veb (pf); +if (!veb)break ; - pf->veb[pf->lan_veb]->seid = seid; - pf->veb[pf->lan_veb]->uplink_seid = pf->mac_seid; - pf->veb[pf->lan_veb]->pf = pf; + veb->seid = seid; + veb->uplink_seid = pf->mac_seid; + veb->pf = pf;break ;case I40E_SWITCH_ELEMENT_TYPE_VSI :if (num_reported !=1 )
@@ -15045,13 +15050,15 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui/* first time setup */ main_vsi =i40e_pf_get_main_vsi (pf);if (!main_vsi || reinit) { +struct i40e_veb *veb;u16 uplink_seid;/* Set up the PF VSI associated with the PF's main VSI * that is already in the HW switch */ -if (pf->lan_veb <I40E_MAX_VEB && pf->veb[pf->lan_veb]) - uplink_seid = pf->veb[pf->lan_veb]->seid; + veb =i40e_pf_get_main_veb (pf); +if (veb) + uplink_seid = veb->seid;else uplink_seid = pf->mac_seid;if (!main_vsi)
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 6/7] i40e: Add helper to access main VEB
Quoted 9 lines · Ivan Vecera
Add a helper to access main VEB:
i40e_pf_get_main_veb(pf)replaces 'pf->veb[pf->lan_veb]'Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>
PATCH v4 7/7 i40e: Add and use helper to reconfigure TC for given VSI
In reply to Ivan VeceraAdd helper i40e_vsi_reconfig_tc(vsi) that configures TC for given VSI using previously stored TC bitmap.
Effectively replaces open-coded patterns:
enabled_tc = vsi->tc_config.enabled_tc;vsi->tc_config.enabled_tc = 0;i40e_vsi_config_tc(vsi, enabled_tc);
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 32 +++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +24 -8
@@ -5917,6 +5917,28 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)return ret; } +/** +* i40e_vsi_reconfig_tc - Reconfigure VSI Tx Scheduler for stored TC map +* @vsi: VSI to be reconfigured +* +* This reconfigures a particular VSI for TCs that are mapped to the +* TC bitmap stored previously for the VSI. +* +* Context: It is expected that the VSI queues have been quisced before +* calling this function. +* +* Return: 0 on success, negative value on failure +**/ +static int i40e_vsi_reconfig_tc (struct i40e_vsi *vsi) +{ +u8 enabled_tc; + + enabled_tc = vsi->tc_config.enabled_tc; + vsi->tc_config.enabled_tc =0 ; + +return i40e_vsi_config_tc (vsi, enabled_tc); +} +/** * i40e_get_link_speed - Returns link speed for the interface * @vsi: VSI to be configured
@@ -14279,7 +14301,6 @@ static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi)struct i40e_vsi *main_vsi;u16 alloc_queue_pairs;struct i40e_pf *pf; -u8 enabled_tc;int ret;if (!vsi)
@@ -14312,10 +14333,8 @@ static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi)* layout configurations. */ main_vsi =i40e_pf_get_main_vsi (pf); - enabled_tc = main_vsi->tc_config.enabled_tc; - main_vsi->tc_config.enabled_tc =0 ; main_vsi->seid = pf->main_vsi_seid; -i40e_vsi_config_tc (main_vsi, enabled_tc); +i40e_vsi_reconfig_tc (main_vsi);if (vsi->type ==I40E_VSI_MAIN )i40e_rm_default_mac_filter (vsi, pf->hw.mac.perm_addr);
@@ -15074,11 +15093,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui } }else {/* force a reset of TC and queue layout configurations */ -u8 enabled_tc = main_vsi->tc_config.enabled_tc; - - main_vsi->tc_config.enabled_tc =0 ; main_vsi->seid = pf->main_vsi_seid; -i40e_vsi_config_tc (main_vsi, enabled_tc); +i40e_vsi_reconfig_tc (main_vsi); }i40e_vlan_stripping_disable (main_vsi);
Signature · 1 line
2.43.2
Re: [PATCH net-next v4 7/7] i40e: Add and use helper to reconfigure TC for given VSI
Quoted 5 lines · Ivan Vecera
Add helper
i40e_vsi_reconfig_tc(vsi)that configures TC for given VSI using previously stored TC bitmap.Effectively replaces open-coded patterns:
Quoted 8 lines
enabled_tc=vsi->tc_config.enabled_tc;vsi->tc_config.enabled_tc= 0;i40e_vsi_config_tc(vsi, enabled_tc);Reviewed-by Michal Schmidt <[email protected]>Reviewed-by Tony Nguyen <[email protected]>Signed-off-by Ivan Vecera <[email protected]>