On 5/6/2024 8:33 AM, Dawid Osuchowski wrote:
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.
Fixes: 67fe64d78c43 ("ice: Implement getting and setting ethtool coalesce")
Signed-off-by: Ngai-Mint Kwan <[email protected]>
Reviewed-by: Mateusz Polchlopek <[email protected]>
Signed-off-by: Pawel Chmielewski <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Co-developed-by: Dawid Osuchowski <[email protected]>
Signed-off-by: Dawid Osuchowski <[email protected]>
---
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
Seems like commit message, and probably title, need to get updated for
this change?
[1]
https://lore.kernel.org/netdev/bl0pr11mb3122d70abde6c2acee376073bd...@bl0pr11mb3122.namprd11.prod.outlook.com/
---
drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c
b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index d91f41f61bce..4ff16fd2eb94 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -3815,6 +3815,13 @@ __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)) {
+ int err = ice_wait_for_reset(vsi->back, 10 * HZ);
+
+ if (err)
+ return err;
+ }
+
if (q_num < 0)
q_num = 0;
