From: Jakub Kicinski <kuba@kernel.org>
To: rkannoth@marvell.com
Cc: Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [net-next,v7,11/13] octeontx2-pf: cn20k: Add TC rules support
Date: Fri, 30 Jan 2026 19:33:23 -0800 [thread overview]
Message-ID: <20260131033323.1013856-1-kuba@kernel.org> (raw)
In-Reply-To: <20260129083339.264386-12-rkannoth@marvell.com>
This is an AI-generated review of your patch. The human sending this
email has considered the AI review valid, or at least plausible.
For local reproduction steps see https://netdev-ai.bots.linux.dev/ai-local.html
---
octeontx2-pf: cn20k: Add TC rules support
This patch adds dynamic MCAM entry allocation for TC rules on CN20K,
with X2/X4 key width support and entry shifting based on priorities.
> diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
> --- a/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c
[ ... ]
> +int cn20k_tc_update_mcam_table_add_req(struct otx2_nic *nic,
> + struct otx2_flow_config *flow_cfg,
> + struct otx2_tc_flow *node)
> +{
> + struct otx2_tc_flow *tmp;
> + u16 cntr_val = 0;
> + int list_idx, i;
> + int entry, prev;
> +
> + list_idx = otx2_tc_add_to_flow_list(flow_cfg, node);
> + entry = node->entry;
> + if (!cn20k_tc_check_entry_shiftable(nic, flow_cfg, node,
> + list_idx, true)) {
> + /* Due to mix of X2 and X4, entries cannot be shifted.
> + * In this case free the entry allocated for this rule.
> + */
> + if (cn20k_tc_free_mcam_entry(nic, entry))
> + netdev_err(nic->netdev,
> + "Freeing entry %d to AF failed\n", entry);
> + return -EINVAL;
^^^^^^^^^^^^^^
When this returns -EINVAL, the caller otx2_tc_add_flow() will then jump
to free_leaf and call cn20k_tc_free_mcam_entry() again with the same
entry value (stored in new_node->entry). Is this a double-free of the
MCAM entry?
> + }
[ ... ]
> diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
> --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
[ ... ]
> + if (is_cn20k(nic->pdev)) {
> + rc = cn20k_tc_alloc_entry(nic, tc_flow_cmd, new_node, &dummy);
> + if (rc) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "MCAM rule allocation failed");
> + kfree_rcu(new_node, rcu);
> + return rc;
> + }
> + }
> +
> + entry = otx2_tc_update_mcam_table(nic, flow_cfg, new_node, true);
> + if (entry < 0) {
> + NL_SET_ERR_MSG_MOD(extack, "Adding rule failed");
> + rc = entry;
> + goto free_leaf;
> + }
> +
> mutex_lock(&nic->mbox.lock);
> req = otx2_mbox_alloc_msg_npc_install_flow(&nic->mbox);
> if (!req) {
> mutex_unlock(&nic->mbox.lock);
> rc = -ENOMEM;
> goto free_leaf;
> }
[ ... ]
> free_leaf:
> + cn20k_tc_free_mcam_entry(nic, new_node->entry);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This function is called unconditionally in the error path, but on
non-CN20K devices new_node->entry was never initialized (it would be 0
from kzalloc). Would this send a mbox message to free MCAM entry 0 on
older silicon? Should this call be guarded with is_cn20k()?
Additionally, when cn20k_tc_update_mcam_table_add_req() fails due to
X2/X4 mix, it already frees the entry before returning -EINVAL. Reaching
this point would then attempt to free the same entry again.
next prev parent reply other threads:[~2026-01-31 3:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-29 8:33 [PATCH net-next v7 00/13] NPC HW block support for cn20k Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 01/13] octeontx2-af: npc: cn20k: Index management Ratheesh Kannoth
2026-01-31 3:33 ` [net-next,v7,01/13] " Jakub Kicinski
2026-01-29 8:33 ` [PATCH net-next v7 02/13] octeontx2-af: npc: cn20k: KPM profile changes Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 03/13] octeontx2-af: npc: cn20k: Add default profile Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 04/13] octeontx2-af: npc: cn20k: MKEX profile support Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 05/13] octeontx2-af: npc: cn20k: Allocate default MCAM indexes Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 06/13] octeontx2-af: npc: cn20k: Use common APIs Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 07/13] octeontx2-af: npc: cn20k: Prepare for new SoC Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 08/13] octeontx2-af: npc: cn20k: Add new mailboxes for CN20K silicon Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 09/13] octeontx2-af: npc: cn20k: virtual index support Ratheesh Kannoth
2026-01-31 3:33 ` [net-next,v7,09/13] " Jakub Kicinski
2026-02-02 4:11 ` Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 10/13] octeontx2-af: npc: cn20k: Allocate MCAM entry for flow installation Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 11/13] octeontx2-pf: cn20k: Add TC rules support Ratheesh Kannoth
2026-01-31 3:33 ` Jakub Kicinski [this message]
2026-01-29 8:33 ` [PATCH net-next v7 12/13] octeontx2-af: npc: cn20k: add debugfs support Ratheesh Kannoth
2026-01-29 8:33 ` [PATCH net-next v7 13/13] octeontx2-af: npc: Use common structures Ratheesh Kannoth
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=20260131033323.1013856-1-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rkannoth@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