shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ice: remove null checks before devm_kfree() calls

Browse Source 
[ Upstream commit ad667d6268 ]

We all know they are redundant.

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Michal Wilczynski <michal.wilczynski@intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Arpana Arland <arpanax.arland@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Stable-dep-of: adbf5a42341f ("ice: remove af_xdp_zc_qps bitmap")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Przemek Kitszel
2023-05-31 14:38:40 +02:00
committed by Greg Kroah-Hartman
parent a388961be5
commit 447a5433bd
6 changed files with 29 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/ice/ice_common.c
View File

@@ -789,8 +789,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)
devm_kfree(ice_hw_to_dev(hw), lst_itr); devm_kfree(ice_hw_to_dev(hw), lst_itr);
} }
} }
if (recps[i].root_buf) devm_kfree(ice_hw_to_dev(hw), recps[i].root_buf);
devm_kfree(ice_hw_to_dev(hw), recps[i].root_buf);
} }
ice_rm_all_sw_replay_rule_info(hw); ice_rm_all_sw_replay_rule_info(hw);
devm_kfree(ice_hw_to_dev(hw), sw->recp_list); devm_kfree(ice_hw_to_dev(hw), sw->recp_list);
@@ -986,8 +985,7 @@ static int ice_cfg_fw_log(struct ice_hw *hw, bool enable)
} }
out: out:
if (data) devm_kfree(ice_hw_to_dev(hw), data);
devm_kfree(ice_hw_to_dev(hw), data);
return status; return status;
} }

3
drivers/net/ethernet/intel/ice/ice_controlq.c
View File

@@ -339,8 +339,7 @@ do { \
} \ } \
} \ } \
/* free the buffer info list */ \ /* free the buffer info list */ \
if ((qi)->ring.cmd_buf) \ devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf); \
devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf); \
/* free DMA head */ \ /* free DMA head */ \
devm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head); \ devm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head); \
} while (0) } while (0)

23
drivers/net/ethernet/intel/ice/ice_flow.c
View File

@@ -1303,23 +1303,6 @@ ice_flow_find_prof_id(struct ice_hw *hw, enum ice_block blk, u64 prof_id)
return NULL; return NULL;
} }
/**
* ice_dealloc_flow_entry - Deallocate flow entry memory
* @hw: pointer to the HW struct
* @entry: flow entry to be removed
*/
static void
ice_dealloc_flow_entry(struct ice_hw *hw, struct ice_flow_entry *entry)
{
if (!entry)
return;
if (entry->entry)
devm_kfree(ice_hw_to_dev(hw), entry->entry);
devm_kfree(ice_hw_to_dev(hw), entry);
}
/** /**
* ice_flow_rem_entry_sync - Remove a flow entry * ice_flow_rem_entry_sync - Remove a flow entry
* @hw: pointer to the HW struct * @hw: pointer to the HW struct
@@ -1335,7 +1318,8 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk,
list_del(&entry->l_entry); list_del(&entry->l_entry);
ice_dealloc_flow_entry(hw, entry); devm_kfree(ice_hw_to_dev(hw), entry->entry);
devm_kfree(ice_hw_to_dev(hw), entry);
return 0; return 0;
} }
@@ -1662,8 +1646,7 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,
out: out:
if (status && e) { if (status && e) {
if (e->entry) devm_kfree(ice_hw_to_dev(hw), e->entry);
devm_kfree(ice_hw_to_dev(hw), e->entry);
devm_kfree(ice_hw_to_dev(hw), e); devm_kfree(ice_hw_to_dev(hw), e);
} }

42
drivers/net/ethernet/intel/ice/ice_lib.c
View File

@@ -320,31 +320,19 @@ static void ice_vsi_free_arrays(struct ice_vsi *vsi)
dev = ice_pf_to_dev(pf); dev = ice_pf_to_dev(pf);
if (vsi->af_xdp_zc_qps) { bitmap_free(vsi->af_xdp_zc_qps);
bitmap_free(vsi->af_xdp_zc_qps); vsi->af_xdp_zc_qps = NULL;
vsi->af_xdp_zc_qps = NULL;
}
/* free the ring and vector containers */ /* free the ring and vector containers */
if (vsi->q_vectors) { devm_kfree(dev, vsi->q_vectors);
devm_kfree(dev, vsi->q_vectors); vsi->q_vectors = NULL;
vsi->q_vectors = NULL; devm_kfree(dev, vsi->tx_rings);
} vsi->tx_rings = NULL;
if (vsi->tx_rings) { devm_kfree(dev, vsi->rx_rings);
devm_kfree(dev, vsi->tx_rings); vsi->rx_rings = NULL;
vsi->tx_rings = NULL; devm_kfree(dev, vsi->txq_map);
} vsi->txq_map = NULL;
if (vsi->rx_rings) { devm_kfree(dev, vsi->rxq_map);
devm_kfree(dev, vsi->rx_rings); vsi->rxq_map = NULL;
vsi->rx_rings = NULL;
}
if (vsi->txq_map) {
devm_kfree(dev, vsi->txq_map);
vsi->txq_map = NULL;
}
if (vsi->rxq_map) {
devm_kfree(dev, vsi->rxq_map);
vsi->rxq_map = NULL;
}
} }
/** /**
@@ -787,10 +775,8 @@ static void ice_rss_clean(struct ice_vsi *vsi)
dev = ice_pf_to_dev(pf); dev = ice_pf_to_dev(pf);
if (vsi->rss_hkey_user) devm_kfree(dev, vsi->rss_hkey_user);
devm_kfree(dev, vsi->rss_hkey_user); devm_kfree(dev, vsi->rss_lut_user);
if (vsi->rss_lut_user)
devm_kfree(dev, vsi->rss_lut_user);
ice_vsi_clean_rss_flow_fld(vsi); ice_vsi_clean_rss_flow_fld(vsi);
/* remove RSS replay list */ /* remove RSS replay list */

11
drivers/net/ethernet/intel/ice/ice_sched.c
View File

@@ -353,10 +353,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node)
node->sibling; node->sibling;
} }
/* leaf nodes have no children */ devm_kfree(ice_hw_to_dev(hw), node->children);
if (node->children)
devm_kfree(ice_hw_to_dev(hw), node->children);
kfree(node->name); kfree(node->name);
xa_erase(&pi->sched_node_ids, node->id); xa_erase(&pi->sched_node_ids, node->id);
devm_kfree(ice_hw_to_dev(hw), node); devm_kfree(ice_hw_to_dev(hw), node);
@@ -854,10 +851,8 @@ void ice_sched_cleanup_all(struct ice_hw *hw)
if (!hw) if (!hw)
return; return;
if (hw->layer_info) { devm_kfree(ice_hw_to_dev(hw), hw->layer_info);
devm_kfree(ice_hw_to_dev(hw), hw->layer_info); hw->layer_info = NULL;
hw->layer_info = NULL;
}
ice_sched_clear_port(hw->port_info); ice_sched_clear_port(hw->port_info);

19
drivers/net/ethernet/intel/ice/ice_switch.c
View File

@@ -1636,21 +1636,16 @@ ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi)
*/ */
static void ice_clear_vsi_q_ctx(struct ice_hw *hw, u16 vsi_handle) static void ice_clear_vsi_q_ctx(struct ice_hw *hw, u16 vsi_handle)
{ {
struct ice_vsi_ctx *vsi; struct ice_vsi_ctx *vsi = ice_get_vsi_ctx(hw, vsi_handle);
u8 i; u8 i;
vsi = ice_get_vsi_ctx(hw, vsi_handle);
if (!vsi) if (!vsi)
return; return;
ice_for_each_traffic_class(i) { ice_for_each_traffic_class(i) {
if (vsi->lan_q_ctx[i]) { devm_kfree(ice_hw_to_dev(hw), vsi->lan_q_ctx[i]);
devm_kfree(ice_hw_to_dev(hw), vsi->lan_q_ctx[i]); vsi->lan_q_ctx[i] = NULL;
vsi->lan_q_ctx[i] = NULL; devm_kfree(ice_hw_to_dev(hw), vsi->rdma_q_ctx[i]);
} vsi->rdma_q_ctx[i] = NULL;
if (vsi->rdma_q_ctx[i]) {
devm_kfree(ice_hw_to_dev(hw), vsi->rdma_q_ctx[i]);
vsi->rdma_q_ctx[i] = NULL;
}
} }
} }
@@ -5525,9 +5520,7 @@ err_unroll:
devm_kfree(ice_hw_to_dev(hw), fvit); devm_kfree(ice_hw_to_dev(hw), fvit);
} }
if (rm->root_buf) devm_kfree(ice_hw_to_dev(hw), rm->root_buf);
devm_kfree(ice_hw_to_dev(hw), rm->root_buf);
kfree(rm); kfree(rm);
err_free_lkup_exts: err_free_lkup_exts: