| Message ID | 20230706042705.3235990-1-rkannoth@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af42088bdaf292060b8d8a00d8644ca7b2b3f2d1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v1] octeontx2-af: Promisc enable/disable through mbox | expand |
On Thu, Jul 06, 2023 at 09:57:05AM +0530, Ratheesh Kannoth wrote: > In legacy silicon, promiscuous mode is only modified > through CGX mbox messages. In CN10KB silicon, it is modified > from CGX mbox and NIX. This breaks legacy application > behaviour. Fix this by removing call from NIX. > > Fixes: d6c9784baf59 ("octeontx2-af: Invoke exact match functions if supported") > Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> > > --- > ChangeLog > > v0 -> v1: Fix 80 lines checkpatch warnings > --- > .../ethernet/marvell/octeontx2/af/rvu_nix.c | 11 ++------- > .../marvell/octeontx2/af/rvu_npc_hash.c | 23 +++++++++++++++++-- > 2 files changed, 23 insertions(+), 11 deletions(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
On Thu, Jul 06, 2023 at 09:57:05AM +0530, Ratheesh Kannoth wrote: > In legacy silicon, promiscuous mode is only modified > through CGX mbox messages. In CN10KB silicon, it is modified > from CGX mbox and NIX. This breaks legacy application > behaviour. Fix this by removing call from NIX. > > Fixes: d6c9784baf59 ("octeontx2-af: Invoke exact match functions if supported") > Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> > > --- > ChangeLog > > v0 -> v1: Fix 80 lines checkpatch warnings Thanks for fixing this! Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 6 Jul 2023 09:57:05 +0530 you wrote: > In legacy silicon, promiscuous mode is only modified > through CGX mbox messages. In CN10KB silicon, it is modified > from CGX mbox and NIX. This breaks legacy application > behaviour. Fix this by removing call from NIX. > > Fixes: d6c9784baf59 ("octeontx2-af: Invoke exact match functions if supported") > Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> > > [...] Here is the summary with links: - [net,v1] octeontx2-af: Promisc enable/disable through mbox https://git.kernel.org/netdev/net/c/af42088bdaf2 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c index 0d745ae1cc9a..04b0e885f9d2 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c @@ -4069,21 +4069,14 @@ int rvu_mbox_handler_nix_set_rx_mode(struct rvu *rvu, struct nix_rx_mode *req, } /* install/uninstall promisc entry */ - if (promisc) { + if (promisc) rvu_npc_install_promisc_entry(rvu, pcifunc, nixlf, pfvf->rx_chan_base, pfvf->rx_chan_cnt); - - if (rvu_npc_exact_has_match_table(rvu)) - rvu_npc_exact_promisc_enable(rvu, pcifunc); - } else { + else if (!nix_rx_multicast) rvu_npc_enable_promisc_entry(rvu, pcifunc, nixlf, false); - if (rvu_npc_exact_has_match_table(rvu)) - rvu_npc_exact_promisc_disable(rvu, pcifunc); - } - return 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 9f11c1e40737..6fe67f3a7f6f 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c @@ -1164,8 +1164,10 @@ static u16 __rvu_npc_exact_cmd_rules_cnt_update(struct rvu *rvu, int drop_mcam_i { struct npc_exact_table *table; u16 *cnt, old_cnt; + bool promisc; table = rvu->hw->table; + promisc = table->promisc_mode[drop_mcam_idx]; cnt = &table->cnt_cmd_rules[drop_mcam_idx]; old_cnt = *cnt; @@ -1177,13 +1179,18 @@ static u16 __rvu_npc_exact_cmd_rules_cnt_update(struct rvu *rvu, int drop_mcam_i *enable_or_disable_cam = false; - /* If all rules are deleted, disable cam */ + if (promisc) + goto done; + + /* If all rules are deleted and not already in promisc mode; + * disable cam + */ if (!*cnt && val < 0) { *enable_or_disable_cam = true; goto done; } - /* If rule got added, enable cam */ + /* If rule got added and not already in promisc mode; enable cam */ if (!old_cnt && val > 0) { *enable_or_disable_cam = true; goto done; @@ -1462,6 +1469,12 @@ int rvu_npc_exact_promisc_disable(struct rvu *rvu, u16 pcifunc) *promisc = false; mutex_unlock(&table->lock); + /* Enable drop rule */ + rvu_npc_enable_mcam_by_entry_index(rvu, drop_mcam_idx, NIX_INTF_RX, + true); + + dev_dbg(rvu->dev, "%s: disabled promisc mode (cgx=%d lmac=%d)\n", + __func__, cgx_id, lmac_id); return 0; } @@ -1503,6 +1516,12 @@ int rvu_npc_exact_promisc_enable(struct rvu *rvu, u16 pcifunc) *promisc = true; mutex_unlock(&table->lock); + /* disable drop rule */ + rvu_npc_enable_mcam_by_entry_index(rvu, drop_mcam_idx, NIX_INTF_RX, + false); + + dev_dbg(rvu->dev, "%s: Enabled promisc mode (cgx=%d lmac=%d)\n", + __func__, cgx_id, lmac_id); return 0; }
In legacy silicon, promiscuous mode is only modified through CGX mbox messages. In CN10KB silicon, it is modified from CGX mbox and NIX. This breaks legacy application behaviour. Fix this by removing call from NIX. Fixes: d6c9784baf59 ("octeontx2-af: Invoke exact match functions if supported") Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com> --- ChangeLog v0 -> v1: Fix 80 lines checkpatch warnings --- .../ethernet/marvell/octeontx2/af/rvu_nix.c | 11 ++------- .../marvell/octeontx2/af/rvu_npc_hash.c | 23 +++++++++++++++++-- 2 files changed, 23 insertions(+), 11 deletions(-)