Skip to contentSkip to conversation

ice: Do not get coalesce settings while in reset

PATCH In review Dawid Osuchowski 3 participants 4 messages Jun 7, 2024 – Jun 14, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 ice: Do not get coalesce settings while in reset

From: Ngai-Mint Kwan <[email protected]>

Getting coalesce settings while reset is in progress can cause NULL pointer deference bug.
If under reset, abort get coalesce for ethtool.

We cannot use ice_wait_for_reset() since both the ethtool handler and the adapter reset flow call rtnl_lock() during operation. If we wait for reset completion inside of an ethtool handling function such as ice_get_coalesce(), the wait will always timeout due to reset being blocked by rtnl_lock() inside of ice_queue_set_napi() (which is called during reset process), and in turn we will always return -EBUSY anyways, with the added hang time of the timeout value.

Fixes 67fe64d78c43 ("ice: Implement getting and setting ethtool coalesce")

---
Changes since v1:
* Added "Fixes:" tag
Changes since v2:
* Rebased over current IWL net branch
* Confirmed that the issue previously reported for this patch [1] by Himasekhar Reddy Pucha was caused by other, internally tracked issue Changes since v3:
* Using ice_wait_for_reset() instead of returning -EBUSY Changes since v4:
* Rebased over current IWL net branch
* Rollback the use of ice_wait_for_reset() due to rtnl_lock() deadlock issue described in [2] and commit msg

[1] https://lore.kernel.org/netdev/BL0PR11MB3122D70ABDE6C2ACEE376073BD90A@BL0PR11MB3122.namprd11.prod.outlook.com/
[2] https://lore.kernel.org/netdev/[email protected]/T/#m1629ecfe88d26551852c5c97982cd10314991422

---
 drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/ice/ice_ethtool.c +3 -0
index 62c8205fceba..2ffe864a364c 100644
@@ -3810,6 +3810,9 @@ __ice_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec,
 	struct ice_netdev_priv *np = netdev_priv(netdev);
 	struct ice_vsi *vsi = np->vsi;
 
+	if (ice_is_reset_in_progress(vsi->back->state))
+		return -EBUSY;
+
 	if (q_num < 0)
 		q_num = 0;
 
Signature · 1 line
2.44.0
Tested-by on v5 1/1
#1 lore raw
Quoted 30 lines

-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Dawid Osuchowski
Sent: Friday, June 7, 2024 5:46 PM
To: [email protected]
Cc: Kwan, Ngai-mint <[email protected]>; [email protected]; Chmielewski, Pawel <[email protected]>; Simon Horman <[email protected]>; Polchlopek, Mateusz <[email protected]>; Dawid Osuchowski <[email protected]>
Subject: [Intel-wired-lan] [PATCH iwl-net v5] ice: Do not get coalesce settings while in reset

From: Ngai-Mint Kwan <[email protected]>

Getting coalesce settings while reset is in progress can cause NULL pointer deference bug. If under reset, abort get coalesce for ethtool.

We cannot use ice_wait_for_reset() since both the ethtool handler and the adapter reset flow call rtnl_lock() during operation. If we wait for reset completion inside of an ethtool handling function such as ice_get_coalesce(), the wait will always timeout due to reset being blocked by rtnl_lock() inside of ice_queue_set_napi() (which is called during reset process), and in turn we will always return -EBUSY anyways, with the added hang time of the timeout value.

Fixes 67fe64d78c43 ("ice: Implement getting and setting ethtool coalesce")

---
Changes since v1:
* Added "Fixes:" tag
Changes since v2:
* Rebased over current IWL net branch
* Confirmed that the issue previously reported for this patch [1] by Himasekhar Reddy Pucha was caused by other, internally tracked issue Changes since v3:
* Using ice_wait_for_reset() instead of returning -EBUSY Changes since v4:
* Rebased over current IWL net branch
* Rollback the use of ice_wait_for_reset() due to rtnl_lock() deadlock issue described in [2] and commit msg

Quoted 6 lines

[1] https://lore.kernel.org/netdev/BL0PR11MB3122D70ABDE6C2ACEE376073BD90A@BL0PR11MB3122.namprd11.prod.outlook.com/
[2] https://lore.kernel.org/netdev/[email protected]/T/#m1629ecfe88d26551852c5c97982cd10314991422

---
 drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +++
 1 file changed, 3 insertions(+)
maintainer
#2 lore raw
In reply to Dawid Osuchowski
Quoted 7 lines · On Fri, 7 Jun 2024 14:15:52 +0200 Dawid Osuchowski wrote:

We cannot use ice_wait_for_reset() since both the ethtool handler and the adapter reset flow call rtnl_lock() during operation. If we wait for reset completion inside of an ethtool handling function such as ice_get_coalesce(), the wait will always timeout due to reset being blocked by rtnl_lock() inside of ice_queue_set_napi() (which is called during reset process), and in turn we will always return -EBUSY anyways, with the added hang time of the timeout value.

Why does the reset not call netif_device_detach()? Then core will know not to call the driver.

Quoted 1 line
Fixes 67fe64d78c43 ("ice: Implement getting and setting ethtool coalesce")

Isn't ice_queue_set_napi() much more recent than this commit?

#3 lore raw
Quoted 2 lines · Jakub Kicinski

Why does the reset not call netif_device_detach()? Then core will know not to call the driver.

Will use this approach in new patch, thanks.

--Dawid