[PATCH] octeontx2-pf: Do not reallocate all ntuple filters

[PATCH] octeontx2-pf: Do not reallocate all ntuple filters

[Subbaraya Sundeep]

If ntuple filters count is modified followed by
unicast filters count using devlink then the ntuple count
set by user is ignored and all the ntuple filters are
being reallocated. Fix this by storing the ntuple count
set by user using devlink.

Fixes: 39c469188b6d ("octeontx2-pf: Add ucast filter count configurability via devlink.")
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
---
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h  | 1 +
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c | 1 +
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
index 1e88422..d6b4b74 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
@@ -356,6 +356,7 @@ struct otx2_flow_config {
 	struct list_head	flow_list_tc;
 	u8			ucast_flt_cnt;
 	bool			ntuple;
+	u16			ntuple_cnt;
 };
 
 struct dev_hw_ops {
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
index 33ec9a7..e13ae548 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
@@ -41,6 +41,7 @@ static int otx2_dl_mcam_count_set(struct devlink *devlink, u32 id,
 	if (!pfvf->flow_cfg)
 		return 0;
 
+	pfvf->flow_cfg->ntuple_cnt = ctx->val.vu16;
 	otx2_alloc_mcam_entries(pfvf, ctx->val.vu16);
 
 	return 0;
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
index 47bfd1f..64c6d916 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
@@ -247,7 +247,7 @@ int otx2_mcam_entry_init(struct otx2_nic *pfvf)
 	mutex_unlock(&pfvf->mbox.lock);
 
 	/* Allocate entries for Ntuple filters */
-	count = otx2_alloc_mcam_entries(pfvf, OTX2_DEFAULT_FLOWCOUNT);
+	count = otx2_alloc_mcam_entries(pfvf, flow_cfg->ntuple_cnt);
 	if (count <= 0) {
 		otx2_clear_ntuple_flow_info(pfvf, flow_cfg);
 		return 0;
@@ -307,6 +307,7 @@ int otx2_mcam_flow_init(struct otx2_nic *pf)
 	INIT_LIST_HEAD(&pf->flow_cfg->flow_list_tc);
 
 	pf->flow_cfg->ucast_flt_cnt = OTX2_DEFAULT_UNICAST_FLOWS;
+	pf->flow_cfg->ntuple_cnt = OTX2_DEFAULT_FLOWCOUNT;
 
 	/* Allocate bare minimum number of MCAM entries needed for
 	 * unicast and ntuple filters.
-- 
2.7.4

Re: [PATCH] octeontx2-pf: Do not reallocate all ntuple filters

[Simon Horman]

On Wed, May 07, 2025 at 10:42:56PM +0530, Subbaraya Sundeep wrote:
> If ntuple filters count is modified followed by
> unicast filters count using devlink then the ntuple count
> set by user is ignored and all the ntuple filters are
> being reallocated. Fix this by storing the ntuple count
> set by user using devlink.
> 
> Fixes: 39c469188b6d ("octeontx2-pf: Add ucast filter count configurability via devlink.")
> Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>

Hi Subbaraya,

I am wondering if this is more of a but fix or more of a cleanup.

If it is a bug then I think an explanation of how it manifests is
warranted, and the patch should be targeted at net. If not, the Fixes tag
should be dropped, and the patch should be targeted at net-next.

...

Re: [PATCH] octeontx2-pf: Do not reallocate all ntuple filters

[Subbaraya Sundeep]

Hi Simon,

On 2025-05-08 at 18:57:31, Simon Horman (horms@kernel.org) wrote:
> On Wed, May 07, 2025 at 10:42:56PM +0530, Subbaraya Sundeep wrote:
> > If ntuple filters count is modified followed by
> > unicast filters count using devlink then the ntuple count
> > set by user is ignored and all the ntuple filters are
> > being reallocated. Fix this by storing the ntuple count
> > set by user using devlink.
> > 
> > Fixes: 39c469188b6d ("octeontx2-pf: Add ucast filter count configurability via devlink.")
> > Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
> 
> Hi Subbaraya,
> 
> I am wondering if this is more of a but fix or more of a cleanup.
> 
> If it is a bug then I think an explanation of how it manifests is
> warranted, and the patch should be targeted at net. If not, the Fixes tag
> should be dropped, and the patch should be targeted at net-next.
These patches target net indeed. My bad I missed net prefix in subject. 
I will send v2 with net prefix.

Thanks,
Sundeep
> 
> ...