octeontx2-af: initialize action variable
PATCH 1/1 octeontx2-af: initialize action variable
From: Tom Rix <[email protected]>
Clang static analysis reports this representative issue rvu_npc.c:898:15: warning: Assigned value is garbage
or undefined
req.match_id = action.match_id;
^ ~~~~~~~~~~~~~~~The initial setting of action is conditional on
if (is_mcam_entry_enabled(...))
The later check of action.op will sometimes be garbage. So initialize action.
Reduce setting of
*(u64 *)&action = 0x00;
to
*(u64 *)&action = 0;
--- .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +7 -8
@@ -605,7 +605,7 @@ void rvu_npc_install_ucast_entry(struct rvu *rvu, u16 pcifunc,struct npc_install_flow_req req = {0 };struct npc_install_flow_rsp rsp = {0 };struct npc_mcam *mcam = &rvu->hw->mcam; -struct nix_rx_action action; +struct nix_rx_action action = {0 };int blkaddr, index;/* AF's and SDP VFs work in promiscuous mode */
@@ -626,7 +626,6 @@ void rvu_npc_install_ucast_entry(struct rvu *rvu, u16 pcifunc, *(u64 *)&action =npc_get_mcam_action (rvu, mcam, blkaddr, index); }else { - *(u64 *)&action =0x00 ; action.op =NIX_RX_ACTIONOP_UCAST ; action.pf_func = pcifunc; }
@@ -657,7 +656,7 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,struct npc_mcam *mcam = &rvu->hw->mcam;struct rvu_hwinfo *hw = rvu->hw;int blkaddr, ucast_idx, index; -struct nix_rx_action action; +struct nix_rx_action action = {0 };u64 relaxed_mask;if (!hw->cap.nix_rx_multicast &&is_cgx_vf (rvu, pcifunc))
@@ -685,14 +684,14 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc, blkaddr, ucast_idx);if (action.op !=NIX_RX_ACTIONOP_RSS ) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_UCAST ; }/* RX_ACTION set to MCAST for CGX PF's */ if (hw->cap.nix_rx_multicast && pfvf->use_mce_list &&is_pf_cgxmapped (rvu,rvu_get_pf (pcifunc))) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_MCAST ; pfvf =rvu_get_pfvf (rvu, pcifunc & ~RVU_PFVF_FUNC_MASK ); action.index = pfvf->promisc_mce_idx;
@@ -832,7 +831,7 @@ void rvu_npc_install_allmulti_entry(struct rvu *rvu, u16 pcifunc, int nixlf,struct rvu_hwinfo *hw = rvu->hw;int blkaddr, ucast_idx, index;u8 mac_addr[ETH_ALEN ] = {0 }; -struct nix_rx_action action; +struct nix_rx_action action = {0 };struct rvu_pfvf *pfvf;u16 vf_func;
@@ -861,14 +860,14 @@ void rvu_npc_install_allmulti_entry(struct rvu *rvu, u16 pcifunc, int nixlf, blkaddr, ucast_idx);if (action.op !=NIX_RX_ACTIONOP_RSS ) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_UCAST ; action.pf_func = pcifunc; }/* RX_ACTION set to MCAST for CGX PF's */ if (hw->cap.nix_rx_multicast && pfvf->use_mce_list) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_MCAST ; action.index = pfvf->mcast_mce_idx; }
Signature · 1 line
2.26.3
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Sat, 26 Mar 2022 09:03:06 -0700 you wrote:
From: Tom Rix <[email protected]>
Clang static analysis reports this representative issue rvu_npc.c:898:15: warning: Assigned value is garbage
or undefinedreq.match_id = action.match_id; ^ ~~~~~~~~~~~~~~~[...]
Here is the summary with links:
- octeontx2-af: initialize action variable
https://git.kernel.org/netdev/net/c/33b5bc9e7033
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html