drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
The cn10k_free_matchall_ipolicer() calls the cn10k_map_unmap_rq_policer()
for each queue in a for loop without checking for any errors.
Check the return value of the cn10k_map_unmap_rq_policer() function during
each loop, and report a warning if the function fails.
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
v3: Add failed queue number and error code to log.
v2: Fix error code
drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
index a15cc86635d6..9113a9b90002 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
@@ -353,8 +353,10 @@ int cn10k_free_matchall_ipolicer(struct otx2_nic *pfvf)
/* Remove RQ's policer mapping */
for (qidx = 0; qidx < hw->rx_queues; qidx++)
- cn10k_map_unmap_rq_policer(pfvf, qidx,
- hw->matchall_ipolicer, false);
+ rc = cn10k_map_unmap_rq_policer(pfvf, qidx, hw->matchall_ipolicer, false);
+ if (rc)
+ dev_warn(pfvf->dev, "Failed to unmap RQ %d's policer (error %d).",
+ qidx, rc);
rc = cn10k_free_leaf_profile(pfvf, hw->matchall_ipolicer);
--
2.42.0.windows.2
On Mon, Apr 07, 2025 at 04:11:17PM +0800, Wentao Liang wrote:
> The cn10k_free_matchall_ipolicer() calls the cn10k_map_unmap_rq_policer()
> for each queue in a for loop without checking for any errors.
>
> Check the return value of the cn10k_map_unmap_rq_policer() function during
> each loop, and report a warning if the function fails.
>
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
> ---
> v3: Add failed queue number and error code to log.
> v2: Fix error code
>
> drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
> index a15cc86635d6..9113a9b90002 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
> @@ -353,8 +353,10 @@ int cn10k_free_matchall_ipolicer(struct otx2_nic *pfvf)
>
> /* Remove RQ's policer mapping */
> for (qidx = 0; qidx < hw->rx_queues; qidx++)
> - cn10k_map_unmap_rq_policer(pfvf, qidx,
> - hw->matchall_ipolicer, false);
> + rc = cn10k_map_unmap_rq_policer(pfvf, qidx, hw->matchall_ipolicer, false);
> + if (rc)
> + dev_warn(pfvf->dev, "Failed to unmap RQ %d's policer (error %d).",
> + qidx, rc);
>
> rc = cn10k_free_leaf_profile(pfvf, hw->matchall_ipolicer);
I think that you need brackets for the for loop now
that it covers more than one statement. Like this:
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
index c3b6e0f60a79..7f6a435ac680 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c
@@ -357,9 +357,12 @@ int cn10k_free_matchall_ipolicer(struct otx2_nic *pfvf)
mutex_lock(&pfvf->mbox.lock);
/* Remove RQ's policer mapping */
- for (qidx = 0; qidx < hw->rx_queues; qidx++)
- cn10k_map_unmap_rq_policer(pfvf, qidx,
- hw->matchall_ipolicer, false);
+ for (qidx = 0; qidx < hw->rx_queues; qidx++) {
+ rc = cn10k_map_unmap_rq_policer(pfvf, qidx, hw->matchall_ipolicer, false);
+ if (rc)
+ dev_warn(pfvf->dev, "Failed to unmap RQ %d's policer (error %d).",
+ qidx, rc);
+ }
rc = cn10k_free_leaf_profile(pfvf, hw->matchall_ipolicer);
Flagged by allmodconfig W=1 builds.
--
pw-bot: changes-requested
On 2025-04-07 at 08:11:17, Wentao Liang (vulab@iscas.ac.cn) wrote: > The cn10k_free_matchall_ipolicer() calls the cn10k_map_unmap_rq_policer() > for each queue in a for loop without checking for any errors. > > Check the return value of the cn10k_map_unmap_rq_policer() function during > each loop, and report a warning if the function fails. > > Signed-off-by: Wentao Liang <vulab@iscas.ac.cn> Reviewed-by: Subbaraya Sundeep <sbhatta@marvell.com> Thanks, Sundeep > --- > v3: Add failed queue number and error code to log. > v2: Fix error code > > drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c > index a15cc86635d6..9113a9b90002 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c > +++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c > @@ -353,8 +353,10 @@ int cn10k_free_matchall_ipolicer(struct otx2_nic *pfvf) > > /* Remove RQ's policer mapping */ > for (qidx = 0; qidx < hw->rx_queues; qidx++) > - cn10k_map_unmap_rq_policer(pfvf, qidx, > - hw->matchall_ipolicer, false); > + rc = cn10k_map_unmap_rq_policer(pfvf, qidx, hw->matchall_ipolicer, false); > + if (rc) > + dev_warn(pfvf->dev, "Failed to unmap RQ %d's policer (error %d).", > + qidx, rc); > > rc = cn10k_free_leaf_profile(pfvf, hw->matchall_ipolicer); > > -- > 2.42.0.windows.2 >
© 2016 - 2026 Red Hat, Inc.