octeontx2-af: fix IP fragment flag corruption on custom KPU profile load
PATCH 1/1 octeontx2-af: fix IP fragment flag corruption on custom KPU profile load
From: Kiran Kumar K <[email protected]>
npc_cn20k_apply_custom_kpu() overwrites KPU profile entries with custom firmware values and then calls npc_cn20k_update_action_entries_n_flags() over all entries. Since the same function already ran during default profile initialisation, entries not overridden by the custom firmware get their flags translated twice, corrupting the CN20K-specific values.
Fix this by extracting the per-entry translation into a helper npc_cn20k_translate_action_flags() and calling it as each custom entry is loaded, removing the redundant batch call at the end.
--- .../ethernet/marvell/octeontx2/af/cn20k/npc.c | 72 +++++++++---------- 1 file changed, 34 insertions(+), 38 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c +34 -38
@@ -1571,53 +1571,49 @@ static u8 npc_map2cn20k_flag(u8 flag)return 0xff ; } +static void npc_cn20k_translate_action_flags (struct npc_kpu_profile_action *act) +{ +u8 ltype, val; + +if (act->lid !=NPC_LID_LC ) +return ; + + ltype = act->ltype; +if (ltype !=NPC_LT_LC_IP && + ltype !=NPC_LT_LC_IP6 && + ltype !=NPC_LT_LC_IP_OPT && + ltype !=NPC_LT_LC_IP6_EXT ) +return ; + +switch (act->flags) { +case NPC_F_LC_U_IP_FRAG : +case NPC_F_LC_U_IP6_FRAG : +case NPC_F_LC_L_6TO4 : +case NPC_F_LC_L_MPLS_IN_IP : +case NPC_F_LC_L_IP6_TUN_IP6 : +case NPC_F_LC_L_IP6_MPLS_IN_IP : + val =npc_map2cn20k_flag (act->flags); +if (val !=0xFF ) + act->flags = val; +break ; +default : +break ; + } +} +void npc_cn20k_update_action_entries_n_flags (struct rvu *rvu,struct npc_kpu_profile_adapter *pfl) {struct npc_kpu_profile_action *action; -int entries, ltype; -u8 flags, val; +int entries;for (int i =0 ; i < pfl->kpus; i++) { action = pfl->kpu[i].action; entries = pfl->kpu[i].action_entries; -for (int j =0 ; j < entries; j++) { -if (action[j].lid !=NPC_LID_LC ) -continue ; - - ltype = action[j].ltype; - -if (ltype !=NPC_LT_LC_IP && - ltype !=NPC_LT_LC_IP6 && - ltype !=NPC_LT_LC_IP_OPT && - ltype !=NPC_LT_LC_IP6_EXT ) -continue ; - - flags = action[j].flags; - -switch (flags) { -case NPC_F_LC_U_IP_FRAG : -case NPC_F_LC_U_IP6_FRAG : -case NPC_F_LC_L_6TO4 : -case NPC_F_LC_L_MPLS_IN_IP : -case NPC_F_LC_L_IP6_TUN_IP6 : -case NPC_F_LC_L_IP6_MPLS_IN_IP : - val =npc_map2cn20k_flag (flags); -if (val ==0xFF ) { -dev_err (rvu->dev, -"%s: Error to get flag value\n" , - __func__); -return ; - } - - action[j].flags = val; -break ; -default : -break ; - } - } +for (int j =0 ; j < entries; j++) +npc_cn20k_translate_action_flags (&action[j]); } }
@@ -1709,9 +1705,9 @@ int npc_cn20k_apply_custom_kpu(struct rvu *rvu,for (entry =0 ; entry < entries; entry++) { profile->kpu[kpu].cam[entry] = cam[entry]; profile->kpu[kpu].action[entry] = action[entry]; +npc_cn20k_translate_action_flags (&profile->kpu[kpu].action[entry]); } } -npc_cn20k_update_action_entries_n_flags (rvu, profile);return 0 ; }
Signature · 1 line
2.48.1
Quoted 8 lines · On Mon, Jun 08, 2026 at 03:24:55PM +0530, [email protected] wrote:
From: Kiran Kumar K <[email protected]>
npc_cn20k_apply_custom_kpu()overwrites KPU profile entries with custom firmware values and then callsnpc_cn20k_update_action_entries_n_flags()over all entries. Since the same function already ran during default profile initialisation, entries not overridden by the custom firmware get their flags translated twice, corrupting the CN20K-specific values.
Quoted 8 lines
Fix this by extracting the per-entry translation into a helper
npc_cn20k_translate_action_flags()and calling it as each custom entry is loaded, removing the redundant batch call at the end.Fixes ef992a0f12e8 ("octeontx2-af: npc: cn20k: MKEX profile support")Cc Suman Ghosh <[email protected]>Signed-off-by Kiran Kumar K <[email protected]>Signed-off-by Nitin Shetty J <[email protected]>
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Mon, 8 Jun 2026 15:24:55 +0530 you wrote:
From: Kiran Kumar K <[email protected]>
npc_cn20k_apply_custom_kpu()overwrites KPU profile entries with custom firmware values and then callsnpc_cn20k_update_action_entries_n_flags()over all entries. Since the same function already ran during default profile initialisation, entries not overridden by the custom firmware get their flags translated twice, corrupting the CN20K-specific values.[...]
Here is the summary with links:
- [net] octeontx2-af: fix IP fragment flag corruption on custom KPU profile load
https://git.kernel.org/netdev/net/c/7360b9609980
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html