octeontx2-af: npc: cn20k: fix NPC defrag
Ratheesh Kannoth
maintainerPATCH 1/1 octeontx2-af: npc: cn20k: fix NPC defrag
npc_defrag_alloc_free_slots() always passed NPC_MCAM_KEY_X2 into __npc_subbank_alloc(), which must match sb->key_type, so defrag never allocated replacement slots on X4 banks. Pass the subbank key type for bank 0, and only extend the search into bank 1 for X2 (X4 MCAM indices are confined to b0b..b0t).
--- drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c +6 -3
@@ -3542,15 +3542,18 @@ static int npc_defrag_alloc_free_slots(struct rvu *rvu, alloc_cnt2 =0 ; rc =__npc_subbank_alloc (rvu, sb, -NPC_MCAM_KEY_X2 , sb->b0b, + f->key_type, sb->b0b, sb->b0t,NPC_MCAM_LOWER_PRIO , false, cnt, save, cnt, true, &alloc_cnt1); -if (alloc_cnt1 < cnt) { +/* X4 entries only occupy bank 0 (b0b..b0t); see npc_subbank_idx_2_mcam_idx(). +* X2 uses both halves of the subbank, so spill into bank 1 if needed. +*/ +if (alloc_cnt1 < cnt && f->key_type ==NPC_MCAM_KEY_X2 ) { rc = __npc_subbank_alloc(rvu, sb, - NPC_MCAM_KEY_X2, sb->b1b, + f->key_type, sb->b1b, sb->b1t, NPC_MCAM_LOWER_PRIO, false, cnt - alloc_cnt1,
Signature · 1 line
2.43.0
Quoted 8 lines · Ratheesh Kannoth
npc_defrag_alloc_free_slots()always passedNPC_MCAM_KEY_X2into__npc_subbank_alloc(), which must matchsb->key_type, so defrag never allocated replacement slots on X4 banks. Pass the subbank key type for bank 0, and only extend the search into bank 1 for X2 (X4 MCAM indices are confined to b0b..b0t).Fixes 645c6e3c1999 ("octeontx2-af: npc: cn20k: virtual index support")Signed-off-by Ratheesh Kannoth <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 17 Jun 2026 15:51:49 +0530 you wrote:
npc_defrag_alloc_free_slots()always passedNPC_MCAM_KEY_X2into__npc_subbank_alloc(), which must matchsb->key_type, so defrag never allocated replacement slots on X4 banks. Pass the subbank key type for bank 0, and only extend the search into bank 1 for X2 (X4 MCAM indices are confined to b0b..b0t).Fixes 645c6e3c1999 ("octeontx2-af: npc: cn20k: virtual index support")Signed-off-by Ratheesh Kannoth <[email protected]>[...]
Here is the summary with links:
- [net] octeontx2-af: npc: cn20k: fix NPC defrag
https://git.kernel.org/netdev/net/c/48b67c0e8af6
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html