Skip to content

Commit d3f867e

Browse files
pgreenwaanguy11
authored andcommitted
ice: fix devlink reload call trace
Commit 4da71a7 ("ice: read internal temperature sensor") introduced internal temperature sensor reading via HWMON. ice_hwmon_init() was added to ice_init_feature() and ice_hwmon_exit() was added to ice_remove(). As a result if devlink reload is used to reinit the device and then the driver is removed, a call trace can occur. BUG: unable to handle page fault for address: ffffffffc0fd4b5d Call Trace: string+0x48/0xe0 vsnprintf+0x1f9/0x650 sprintf+0x62/0x80 name_show+0x1f/0x30 dev_attr_show+0x19/0x60 The call trace repeats approximately every 10 minutes when system monitoring tools (e.g., sadc) attempt to read the orphaned hwmon sysfs attributes that reference freed module memory. The sequence is: 1. Driver load, ice_hwmon_init() gets called from ice_init_feature() 2. Devlink reload down, flow does not call ice_remove() 3. Devlink reload up, ice_hwmon_init() gets called from ice_init_feature() resulting in a second instance 4. Driver unload, ice_hwmon_exit() called from ice_remove() leaving the first hwmon instance orphaned with dangling pointer Fix this by moving ice_hwmon_exit() from ice_remove() to ice_deinit_features() to ensure proper cleanup symmetry with ice_hwmon_init(). Fixes: 4da71a7 ("ice: read internal temperature sensor") Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 42fb5f3 commit d3f867e

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4836,6 +4836,7 @@ static void ice_deinit_features(struct ice_pf *pf)
48364836
ice_dpll_deinit(pf);
48374837
if (pf->eswitch_mode == DEVLINK_ESWITCH_MODE_SWITCHDEV)
48384838
xa_destroy(&pf->eswitch.reprs);
4839+
ice_hwmon_exit(pf);
48394840
}
48404841

48414842
static void ice_init_wakeup(struct ice_pf *pf)
@@ -5437,8 +5438,6 @@ static void ice_remove(struct pci_dev *pdev)
54375438
ice_free_vfs(pf);
54385439
}
54395440

5440-
ice_hwmon_exit(pf);
5441-
54425441
if (!ice_is_safe_mode(pf))
54435442
ice_remove_arfs(pf);
54445443

0 commit comments

Comments
 (0)