public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Ratheesh Kannoth <rkannoth@marvell.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <sgoutham@marvell.com>, <davem@davemloft.net>,
	<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
	<andrew+netdev@lunn.ch>, Suman Ghosh <sumang@marvell.com>
Subject: Re: [PATCH v3 net 11/11] octeontx2-af: npc: cn20k: Reject missing default-rule MCAM indices
Date: Mon, 27 Apr 2026 09:48:31 +0530	[thread overview]
Message-ID: <ae7jlymNEI95_pA0@rkannoth-OptiPlex-7090> (raw)
In-Reply-To: <20260423104317.2707923-12-rkannoth@marvell.com>

On 2026-04-23 at 16:13:17, Ratheesh Kannoth (rkannoth@marvell.com) wrote:
> When cn20k default L2 rules are not installed,
> npc_cn20k_dft_rules_idx_get() leaves broadcast, multicast,
> promiscuous, and unicast slots at USHRT_MAX.
> npc_get_nixlf_mcam_index() previously returned that sentinel as a
> valid MCAM index, so callers could program hardware with an invalid
> index.
>
> Return -EINVAL from the cn20k branches of npc_get_nixlf_mcam_index()
> when the requested slot is still USHRT_MAX.  Harden cn20k NPC MCAM
> entry helpers to reject out-of-range indices before touching hardware.
>
> Drop the early bounds check in npc_enable_mcam_entry() for cn20k so
> invalid indices are validated inside npc_cn20k_enable_mcam_entry()
> instead of being silently ignored.
>
> In rvu_npc_update_flowkey_alg_idx(), treat negative MCAM indices like
> out-of-range values, and only update RSS actions for promiscuous and
> all-multi paths when the resolved index is non-negative.
>
> Cc: Suman Ghosh <sumang@marvell.com>
> Fixes: 6d1e70282f76 ("octeontx2-af: npc: cn20k: Use common APIs")
> Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
> ---
>  .../ethernet/marvell/octeontx2/af/cn20k/npc.c |  14 +-
>  .../ethernet/marvell/octeontx2/af/cn20k/npc.h |   1 +
>  .../ethernet/marvell/octeontx2/af/rvu_nix.c   |   3 +
>  .../ethernet/marvell/octeontx2/af/rvu_npc.c   | 138 +++++++++++++++++-
>  .../marvell/octeontx2/af/rvu_npc_fs.c         |  10 +-
>  .../marvell/octeontx2/af/rvu_npc_hash.c       |  19 ++-
>  .../marvell/octeontx2/nic/otx2_flows.c        |   1 +
>  7 files changed, 172 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
> index 54a25d9c5505..1b3f2421ea32 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
> @@ -808,6 +808,9 @@ npc_cn20k_enable_mcam_entry(struct rvu *rvu, int blkaddr,
>  	u64 cfg, hw_prio;
>  	u8 kw_type;
>
> +	if (index < 0 || index >= mcam->total_entries)
> +		return -EINVAL;
> +
>  	if (npc_mcam_idx_2_key_type(rvu, index, &kw_type))
>  		return -EINVAL;
>
> @@ -1056,6 +1059,9 @@ int npc_cn20k_config_mcam_entry(struct rvu *rvu, int blkaddr, int index,
>  	int kw = 0;
>  	u8 kw_type;
>
> +	if (index < 0 || index >= mcam->total_entries)
> +		return -EINVAL;
> +
>  	if (npc_mcam_idx_2_key_type(rvu, index, &kw_type))
>  		return -EINVAL;
>
> @@ -1148,6 +1154,9 @@ int npc_cn20k_copy_mcam_entry(struct rvu *rvu, int blkaddr, u16 src, u16 dest)
>  	int bank, i, sb, db;
>  	int dbank, sbank;
>
> +	if (src >= mcam->total_entries || dest >= mcam->total_entries)
> +		return -EINVAL;
> +
>  	dbank = npc_get_bank(mcam, dest);
>  	sbank = npc_get_bank(mcam, src);
>
> @@ -1213,6 +1222,9 @@ int npc_cn20k_read_mcam_entry(struct rvu *rvu, int blkaddr, u16 index,
>  	int kw = 0, bank;
>  	u8 kw_type;
>
> +	if (index >= mcam->total_entries)
> +		return -EINVAL;
> +
>  	if (npc_mcam_idx_2_key_type(rvu, index, &kw_type))
>  		return -EINVAL;
>
> @@ -4158,7 +4170,7 @@ int rvu_mbox_handler_npc_get_dft_rl_idxs(struct rvu *rvu, struct msg_req *req,
>  	return 0;
>  }
>
> -static bool npc_is_cgx_or_lbk(struct rvu *rvu, u16 pcifunc)
> +bool npc_is_cgx_or_lbk(struct rvu *rvu, u16 pcifunc)
>  {
>  	return is_pf_cgxmapped(rvu, rvu_get_pf(rvu->pdev, pcifunc)) ||
>  		is_lbk_vf(rvu, pcifunc);
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h
> index 2f761b97f91b..3d5eb952cc07 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h
> @@ -335,5 +335,6 @@ int npc_mcam_idx_2_key_type(struct rvu *rvu, u16 mcam_idx, u8 *key_type);
>  u16 npc_cn20k_vidx2idx(u16 index);
>  u16 npc_cn20k_idx2vidx(u16 idx);
>  int npc_cn20k_defrag(struct rvu *rvu);
> +bool npc_is_cgx_or_lbk(struct rvu *rvu, u16 pcifunc);
>
>  #endif /* NPC_CN20K_H */
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> index ef5b081162eb..f977734ae712 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> @@ -3577,6 +3577,9 @@ static int nix_update_mce_rule(struct rvu *rvu, u16 pcifunc,
>  	mcam_index = npc_get_nixlf_mcam_index(mcam,
>  					      pcifunc & ~RVU_PFVF_FUNC_MASK,
>  					      nixlf, type);
> +	if (mcam_index < 0)
> +		return -EINVAL;
> +
>  	err = nix_update_mce_list(rvu, pcifunc, mce_list,
>  				  mce_idx, mcam_index, add);
>  	return err;
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
> index 5d349d131fdb..611cd7fce245 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
> @@ -163,14 +163,35 @@ int npc_get_nixlf_mcam_index(struct npc_mcam *mcam,
>  		if (rc)
>  			return -EFAULT;
>
> +		if (is_lbk_vf(rvu, pcifunc)) {
> +			if (promisc == USHRT_MAX)
> +				return -EINVAL;
> +			return promisc;
> +		}
> +
> +		if (is_cgx_vf(rvu, pcifunc)) {
> +			if (ucast == USHRT_MAX)
> +				return -EINVAL;
> +
> +			return ucast;
> +		}
> +
>  		switch (type) {
>  		case NIXLF_BCAST_ENTRY:
> +			if (bcast == USHRT_MAX)
> +				return -EINVAL;
>  			return bcast;
>  		case NIXLF_ALLMULTI_ENTRY:
> +			if (mcast == USHRT_MAX)
> +				return -EINVAL;
>  			return mcast;
>  		case NIXLF_PROMISC_ENTRY:
> +			if (promisc == USHRT_MAX)
> +				return -EINVAL;
>  			return promisc;
>  		case NIXLF_UCAST_ENTRY:
> +			if (ucast == USHRT_MAX)
> +				return -EINVAL;
>  			return ucast;
>  		default:
>  			return -EINVAL;
> @@ -238,9 +259,6 @@ void npc_enable_mcam_entry(struct rvu *rvu, struct npc_mcam *mcam,
>  	int actbank = bank;
>
>  	if (is_cn20k(rvu->pdev)) {
> -		if (index < 0 || index >= mcam->banksize * mcam->banks)
> -			return;
> -
>  		if (npc_cn20k_enable_mcam_entry(rvu, blkaddr, index, enable))
>  			dev_err(rvu->dev, "Error to %s mcam %u entry\n",
>  				enable ? "enable" : "disable", index);
> @@ -434,6 +452,15 @@ static u64 npc_get_default_entry_action(struct rvu *rvu, struct npc_mcam *mcam,
>
>  	index = npc_get_nixlf_mcam_index(mcam, pf_func, nixlf,
>  					 NIXLF_UCAST_ENTRY);
> +
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: failed to get ucast entry pcifunc:0x%x\n",
> +			__func__, pf_func);
> +		/* Action 0 is drop */
> +		return 0;
> +	}
> +
>  	bank = npc_get_bank(mcam, index);
>  	index &= (mcam->banksize - 1);
>
> @@ -700,6 +727,12 @@ void rvu_npc_install_ucast_entry(struct rvu *rvu, u16 pcifunc,
>
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					 nixlf, NIXLF_UCAST_ENTRY);
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get ucast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
>
>  	/* Don't change the action if entry is already enabled
>  	 * Otherwise RSS action may get overwritten.
> @@ -755,11 +788,21 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					 nixlf, NIXLF_PROMISC_ENTRY);
>
> +	/* In cn20k, default indexes are installed only for CGX mapped
> +	 * and lbk interfaces
> +	 */
>  	if (is_cgx_vf(rvu, pcifunc))
>  		index = npc_get_nixlf_mcam_index(mcam,
>  						 pcifunc & ~RVU_PFVF_FUNC_MASK,
>  						 nixlf, NIXLF_PROMISC_ENTRY);
>
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get promisc entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
> +
>  	/* If the corresponding PF's ucast action is RSS,
>  	 * use the same action for promisc also
>  	 * Please note that for lbk(s) "index" and "ucast_idx"
> @@ -770,6 +813,12 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,
>  	else
>  		ucast_idx = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  						     nixlf, NIXLF_UCAST_ENTRY);
> +	if (ucast_idx < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get ucast/promisc entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
>
>  	if (is_mcam_entry_enabled(rvu, mcam, blkaddr, ucast_idx))
>  		*(u64 *)&action = npc_get_mcam_action(rvu, mcam,
> @@ -844,6 +893,14 @@ void rvu_npc_enable_promisc_entry(struct rvu *rvu, u16 pcifunc,
>
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					 nixlf, NIXLF_PROMISC_ENTRY);
> +
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get promisc entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
> +
>  	npc_enable_mcam_entry(rvu, mcam, blkaddr, index, enable);
>  }
>
> @@ -884,6 +941,12 @@ void rvu_npc_install_bcast_match_entry(struct rvu *rvu, u16 pcifunc,
>
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					 nixlf, NIXLF_BCAST_ENTRY);
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get bcast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
>
>  	if (!hw->cap.nix_rx_multicast) {
>  		/* Early silicon doesn't support pkt replication,
> @@ -948,12 +1011,25 @@ void rvu_npc_install_allmulti_entry(struct rvu *rvu, u16 pcifunc, int nixlf,
>
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					 nixlf, NIXLF_ALLMULTI_ENTRY);
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get mcast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
>
>  	/* If the corresponding PF's ucast action is RSS,
>  	 * use the same action for multicast entry also
>  	 */
>  	ucast_idx = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					     nixlf, NIXLF_UCAST_ENTRY);
> +	if (ucast_idx < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get ucast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
> +
>  	if (is_mcam_entry_enabled(rvu, mcam, blkaddr, ucast_idx))
>  		*(u64 *)&action = npc_get_mcam_action(rvu, mcam,
>  							blkaddr, ucast_idx);
> @@ -1018,6 +1094,13 @@ void rvu_npc_enable_allmulti_entry(struct rvu *rvu, u16 pcifunc, int nixlf,
>
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc, nixlf,
>  					 NIXLF_ALLMULTI_ENTRY);
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get mcast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
> +
>  	npc_enable_mcam_entry(rvu, mcam, blkaddr, index, enable);
>  }
>
> @@ -1130,8 +1213,12 @@ void rvu_npc_update_flowkey_alg_idx(struct rvu *rvu, u16 pcifunc, int nixlf,
>  		index = mcam_index;
>  	}
>
> -	if (index >= mcam->total_entries)
> +	if (index < 0 || index >= mcam->total_entries) {
> +		dev_err(rvu->dev,
> +			"%s: Invalid mcam index, pcifunc=%#x\n",
> +			__func__, pcifunc);
>  		return;
> +	}
>
>  	bank = npc_get_bank(mcam, index);
>  	index &= (mcam->banksize - 1);
> @@ -1175,16 +1262,18 @@ void rvu_npc_update_flowkey_alg_idx(struct rvu *rvu, u16 pcifunc, int nixlf,
>  		/* If PF's promiscuous  entry is enabled,
>  		 * Set RSS action for that entry as well
>  		 */
> -		npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index,
> -						  blkaddr, alg_idx);
> +		if (index >= 0)
> +			npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index,
> +							  blkaddr, alg_idx);
>
>  		index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  						 nixlf, NIXLF_ALLMULTI_ENTRY);
>  		/* If PF's allmulti  entry is enabled,
>  		 * Set RSS action for that entry as well
>  		 */
> -		npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index,
> -						  blkaddr, alg_idx);
> +		if (index >= 0)
> +			npc_update_rx_action_with_alg_idx(rvu, action, pfvf, index,
> +							  blkaddr, alg_idx);
>  	}
>  }
>
> @@ -1197,12 +1286,22 @@ void npc_enadis_default_mce_entry(struct rvu *rvu, u16 pcifunc,
>  	int index, blkaddr, mce_idx;
>  	struct rvu_pfvf *pfvf;
>
> +	/* multicast pkt replication is not enabled for AF's VFs & SDP links */
> +	if (is_lbk_vf(rvu, pcifunc) || is_sdp_pfvf(rvu, pcifunc))
> +		return;
> +
>  	blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NPC, 0);
>  	if (blkaddr < 0)
>  		return;
>
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc & ~RVU_PFVF_FUNC_MASK,
>  					 nixlf, type);
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get entry for pcifunc=%#x, type=%u\n",
> +			__func__, pcifunc, type);
> +		return;
> +	}
>
>  	/* disable MCAM entry when packet replication is not supported by hw */
>  	if (!hw->cap.nix_rx_multicast && !is_vf(pcifunc)) {
> @@ -1231,6 +1330,10 @@ static void npc_enadis_default_entries(struct rvu *rvu, u16 pcifunc,
>  	struct npc_mcam *mcam = &rvu->hw->mcam;
>  	int index, blkaddr;
>
> +	/* only CGX or LBK interfaces have default entries */
> +	if (is_cn20k(rvu->pdev) && !npc_is_cgx_or_lbk(rvu, pcifunc))
> +		return;
> +
>  	blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NPC, 0);
>  	if (blkaddr < 0)
>  		return;
> @@ -1240,6 +1343,12 @@ static void npc_enadis_default_entries(struct rvu *rvu, u16 pcifunc,
>  				     pfvf->nix_rx_intf)) {
>  		index = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  						 nixlf, NIXLF_UCAST_ENTRY);
> +		if (index < 0) {
> +			dev_err(rvu->dev,
> +				"%s: Error to get ucast entry for pcifunc=%#x\n",
> +				__func__, pcifunc);
> +			return;
> +		}
>  		npc_enable_mcam_entry(rvu, mcam, blkaddr, index, enable);
>  	}
>
> @@ -3897,6 +4006,13 @@ int rvu_mbox_handler_npc_read_base_steer_rule(struct rvu *rvu,
>  	/* Read the default ucast entry if there is no pkt steering rule */
>  	index = npc_get_nixlf_mcam_index(mcam, pcifunc, nixlf,
>  					 NIXLF_UCAST_ENTRY);
> +	if (index < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get ucast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		goto out;
> +	}
> +
>  read_entry:
>  	/* Read the mcam entry */
>  	npc_read_mcam_entry(rvu, mcam, blkaddr, index, &rsp->entry, &intf,
> @@ -3970,6 +4086,12 @@ void rvu_npc_clear_ucast_entry(struct rvu *rvu, int pcifunc, int nixlf)
>
>  	ucast_idx = npc_get_nixlf_mcam_index(mcam, pcifunc,
>  					     nixlf, NIXLF_UCAST_ENTRY);
> +	if (ucast_idx < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get ucast entry for pcifunc=%#x\n",
> +			__func__, pcifunc);
> +		return;
> +	}
>
>  	npc_enable_mcam_entry(rvu, mcam, blkaddr, ucast_idx, false);
>
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
> index dd5d50d52964..d20eb0e47d7d 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
> @@ -1444,7 +1444,7 @@ static int npc_install_flow(struct rvu *rvu, int blkaddr, u16 target,
>  	struct msg_rsp write_rsp;
>  	struct mcam_entry *entry;
>  	bool new = false;
> -	u16 entry_index;
> +	int entry_index;
>  	int err;
>
>  	installed_features = req->features;
> @@ -1477,6 +1477,14 @@ static int npc_install_flow(struct rvu *rvu, int blkaddr, u16 target,
>  	if (req->default_rule) {
>  		entry_index = npc_get_nixlf_mcam_index(mcam, target, nixlf,
>  						       NIXLF_UCAST_ENTRY);
> +
> +		if (entry_index < 0) {
> +			dev_err(rvu->dev,
> +				"%s: Error to get ucast entry for target=%#x\n",
> +				__func__, target);
> +			return -EINVAL;
> +		}
> +
>  		enable = is_mcam_entry_enabled(rvu, mcam, blkaddr, entry_index);
>  	}
>
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
> index 03bb485a1aca..59c1a105faad 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
> @@ -1753,7 +1753,7 @@ int rvu_npc_exact_mac_addr_set(struct rvu *rvu, struct cgx_mac_addr_set_or_get *
>  	u32 seq_id = req->index;
>  	struct rvu_pfvf *pfvf;
>  	u8 cgx_id, lmac_id;
> -	u32 mcam_idx = -1;
> +	int mcam_idx = -1;
>  	int rc, nixlf;
>
>  	rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
> @@ -1783,9 +1783,20 @@ int rvu_npc_exact_mac_addr_set(struct rvu *rvu, struct cgx_mac_addr_set_or_get *
>
>  	/* find mcam entry if exist */
>  	rc = nix_get_nixlf(rvu, req->hdr.pcifunc, &nixlf, NULL);
> -	if (!rc) {
> -		mcam_idx = npc_get_nixlf_mcam_index(&rvu->hw->mcam, req->hdr.pcifunc,
> -						    nixlf, NIXLF_UCAST_ENTRY);
> +	if (rc) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get nixlf pcifunc=%#x\n",
> +			__func__, req->hdr.pcifunc);
> +		return LMAC_AF_ERR_PERM_DENIED;
> +	}
> +
> +	mcam_idx = npc_get_nixlf_mcam_index(&rvu->hw->mcam, req->hdr.pcifunc,
> +					    nixlf, NIXLF_UCAST_ENTRY);
> +	if (mcam_idx < 0) {
> +		dev_err(rvu->dev,
> +			"%s: Error to get ucast entry for pcifunc=%#x\n",
> +			__func__, req->hdr.pcifunc);
> +		return LMAC_AF_ERR_INVALID_PARAM;
>  	}
>
>  	rc = rvu_npc_exact_add_table_entry(rvu, cgx_id, lmac_id, req->mac_addr,
> diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
> index 5dd0591fed99..b2d777b5cb59 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
> @@ -340,6 +340,7 @@ int otx2_mcam_entry_init(struct otx2_nic *pfvf)
>  	req->kw_type = NPC_MCAM_KEY_X2;
>  	if (is_cn20k(pfvf->pdev) && kw_type == NPC_MCAM_KEY_X4) {
>  		req->kw_type = NPC_MCAM_KEY_X4;
> +		/* In X4 profile, x4_slots is equal to bank depth */
>  		ref &= (x4_slots - 1);
>  	}
>  	req->contig = false;
> --
> 2.43.0
>

> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
>> index 03bb485a1aca18..59c1a105faad5f 100644
>> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
>> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
>[ ... ]
>> @@ -1783,9 +1783,20 @@ int rvu_npc_exact_mac_addr_set(struct rvu *rvu, struct cgx_mac_addr_set_or_get *
>>
>>  	/* find mcam entry if exist */
>>  	rc = nix_get_nixlf(rvu, req->hdr.pcifunc, &nixlf, NULL);
>> -	if (!rc) {
>> -		mcam_idx = npc_get_nixlf_mcam_index(&rvu->hw->mcam, req->hdr.pcifunc,
>> -						    nixlf, NIXLF_UCAST_ENTRY);
>> +	if (rc) {
>> +		dev_err(rvu->dev,
>> +			"%s: Error to get nixlf pcifunc=%#x\n",
>> +			__func__, req->hdr.pcifunc);
>> +		return LMAC_AF_ERR_PERM_DENIED;
>> +	}
>> +
>> +	mcam_idx = npc_get_nixlf_mcam_index(&rvu->hw->mcam, req->hdr.pcifunc,
>> +					    nixlf, NIXLF_UCAST_ENTRY);
>Does returning LMAC_AF_ERR_PERM_DENIED here prevent configuring the MAC address
>when the interface is down?
>Previously, if nix_get_nixlf() failed (which happens when the interface is
>down and no NIXLF is attached), the code simply skipped fetching the MCAM
>index and left mcam_idx as -1, but continued successfully to register the MAC
>address via rvu_npc_exact_add_table_entry().

ACK. Will revert this change. There is no issue even if mcam_idx is -1 when added to list

      parent reply	other threads:[~2026-04-27  4:18 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-23 10:43 [PATCH v3 net 0/11] octeontx2-af: npc: cn20k: MCAM fixes Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 01/11] octeontx2-af: npc: cn20k: Propagate MCAM key-type errors on cn20k Ratheesh Kannoth
2026-04-24  8:21   ` Ratheesh Kannoth
2026-04-24 10:54   ` Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 02/11] octeontx2-af: npc: cn20k: Drop debugfs_create_file() error checks in init Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 03/11] octeontx2-af: npc: cn20k: Propagate errors in defrag MCAM alloc rollback Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 04/11] octeontx2-af: npc: cn20k: Make default entries as x4 Ratheesh Kannoth
2026-04-24  8:26   ` Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 05/11] octeontx2-af: npc: cn20k: Align MCAM X2/X4 use with KEX profile Ratheesh Kannoth
2026-04-24  9:06   ` Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 06/11] octeontx2-af: npc: cn20k: Clear MCAM entries by index and key width Ratheesh Kannoth
2026-04-27  3:44   ` Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 07/11] octeontx2-af: npc: cn20k: Fix bank value Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 08/11] octeontx2-af: npc: cn20k: Fix MCAM actions read Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 09/11] octeontx2-af: npc: cn20k: Initialize default-rule index outputs up front Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 10/11] octeontx2-af: npc: cn20k: Tear down default MCAM rules explicitly on free Ratheesh Kannoth
2026-04-24  9:11   ` Ratheesh Kannoth
2026-04-27  3:53   ` Ratheesh Kannoth
2026-04-23 10:43 ` [PATCH v3 net 11/11] octeontx2-af: npc: cn20k: Reject missing default-rule MCAM indices Ratheesh Kannoth
2026-04-24  9:15   ` Ratheesh Kannoth
2026-04-27  4:18   ` Ratheesh Kannoth [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ae7jlymNEI95_pA0@rkannoth-OptiPlex-7090 \
    --to=rkannoth@marvell.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sgoutham@marvell.com \
    --cc=sumang@marvell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox