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).

Fixes: 645c6e3c1999 ("octeontx2-af: npc: cn20k: virtual index support")
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260617102149.1309913-1-rkannoth@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
index 354c4e881c6a2222ed26faa8e9b3593a605b10ed..9052b88f36851d64f1ad0dd68727b150cf03c0a4 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
@@ -3569,15 +3569,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,