iavf: Move netdev_update_features() into watchdog task
Subsystems (2)
PATCH 1/1 iavf: Move netdev_update_features() into watchdog task
Remove netdev_update_features() from iavf_adminq_task(), as it can cause deadlocks due to needing rtnl_lock. Instead use the IAVF_FLAG_SETUP_NETDEV_FEATURES flag to indicate that netdev features need to be updated in the watchdog task. iavf_set_vlan_offload_features() and iavf_set_queue_vlan_tag_loc() can be called directly from iavf_virtchnl_completion().
---
This patch is a suggested replacement for patch [1], and as such will
currently not apply to dev-queue. It solves the same issue, but does not
increase code complexity by introducing a new task.
[1] https://patchwork.ozlabs.org/project/intel-wired-lan/patch/[email protected]/
drivers/net/ethernet/intel/iavf/iavf_main.c | 27 +++++++------------ .../net/ethernet/intel/iavf/iavf_virtchnl.c | 8 ++++++ 2 files changed, 17 insertions(+), 18 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +9 -18
@@ -2692,6 +2692,15 @@ static void iavf_watchdog_task(struct work_struct *work) goto restart_watchdog; } +if ((adapter->flags &IAVF_FLAG_SETUP_NETDEV_FEATURES ) && + adapter->netdev_registered && + !test_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section) && +rtnl_trylock ()) { +netdev_update_features (adapter->netdev); +rtnl_unlock (); + adapter->flags &= ~IAVF_FLAG_SETUP_NETDEV_FEATURES ; + } +if (adapter->flags &IAVF_FLAG_PF_COMMS_FAILED )iavf_change_state (adapter, __IAVF_COMM_FAILED);
@@ -3233,24 +3242,6 @@ static void iavf_adminq_task(struct work_struct *work) }while (pending);mutex_unlock (&adapter->crit_lock); -if ((adapter->flags &IAVF_FLAG_SETUP_NETDEV_FEATURES )) { -if (adapter->netdev_registered || - !test_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) { -struct net_device *netdev = adapter->netdev; - -rtnl_lock (); -netdev_update_features (netdev); -rtnl_unlock (); -/* Request VLAN offload settings */ -if (VLAN_V2_ALLOWED (adapter)) -iavf_set_vlan_offload_features - (adapter,0 , netdev->features); - -iavf_set_queue_vlan_tag_loc (adapter); - } - - adapter->flags &= ~IAVF_FLAG_SETUP_NETDEV_FEATURES ; - }if ((adapter->flags & (IAVF_FLAG_RESET_PENDING |IAVF_FLAG_RESET_NEEDED )) || adapter->state == __IAVF_RESETTING)
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +8 -0
@@ -2226,6 +2226,14 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,iavf_process_config (adapter); adapter->flags |=IAVF_FLAG_SETUP_NETDEV_FEATURES ; + +/* Request VLAN offload settings */ +if (VLAN_V2_ALLOWED (adapter)) +iavf_set_vlan_offload_features (adapter,0 , + netdev->features); + +iavf_set_queue_vlan_tag_loc (adapter); + was_mac_changed = !ether_addr_equal (netdev->dev_addr, adapter->hw.mac.addr);
Signature · 6 lines
2.31.1 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
drivers/net/ethernet/intel/iavf/iavf_main.c
Quoted 38 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Marcin Szycik
Sent: wtorek, 3 stycznia 2023 17:42
To: [email protected]
Cc: Wesierski, DawidX <[email protected]>; Nguyen, Anthony L <[email protected]>; Burra, Phani R <[email protected]>
Subject: [Intel-wired-lan] [PATCH net] iavf: Movenetdev_update_features()into watchdog taskRemove
netdev_update_features()fromiavf_adminq_task(), as it can cause deadlocks due to needingrtnl_lock. Instead use theIAVF_FLAG_SETUP_NETDEV_FEATURESflag to indicate that netdev features need to be updated in the watchdog task.iavf_set_vlan_offload_features()andiavf_set_queue_vlan_tag_loc()can be called directly fromiavf_virtchnl_completion().Suggested-by Phani Burra <[email protected]>Signed-off-by Marcin Szycik <[email protected]>Reviewed-by Alexander Lobakin <[email protected]>---
This patch is a suggested replacement for patch [1], and as such will currently not apply to dev-queue. It solves the same issue, but does not increase code complexity by introducing a new task.
[1] https://patchwork.ozlabs.org/project/intel-wired-
lan/patch/[email protected]/drivers/net/ethernet/intel/iavf/iavf_main.c | 27 +++++++------------ .../net/ethernet/intel/iavf/iavf_virtchnl.c | 8 ++++++ 2 files changed, 17 insertions(+), 18 deletions(-)drivers/net/ethernet/intel/iavf/iavf_main.c +0
-0
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan