From: Jacob Keller <jacob.e.keller@intel•com>
To: Haoxiang Li <lihaoxiang@isrc•iscas.ac.cn>,
<andrew+netdev@lunn•ch>, <edumazet@google•com>,
<davem@davemloft•net>, <kuba@kernel•org>, <pabeni@redhat•com>,
<Steen.Hegelund@microchip•com>, <daniel.machon@microchip•com>,
<UNGLinuxDriver@microchip•com>
Cc: <netdev@vger•kernel.org>, <linux-arm-kernel@lists•infradead.org>,
<linux-kernel@vger•kernel.org>
Subject: Re: [PATCH] net: microchip: sparx5: clean up PSFP resources on flower setup failure
Date: Wed, 27 May 2026 13:54:29 -0700 [thread overview]
Message-ID: <1af08d75-ecc7-4e8b-abab-dcff2eac5228@intel.com> (raw)
In-Reply-To: <20260527073855.2334001-1-lihaoxiang@isrc.iscas.ac.cn>
On 5/27/2026 12:38 AM, Haoxiang Li wrote:
> Add error handling paths to unwind the PSFP resources that have already
> been allocated before returning the error.
>
> Signed-off-by: Haoxiang Li <lihaoxiang@isrc•iscas.ac.cn>
> ---
Reviewed-by: Jacob Keller <jacob.e.keller@intel•com>
> .../microchip/sparx5/sparx5_tc_flower.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
> index 4dc1ebd5d510..e5022d783ee6 100644
> --- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
> +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c
> @@ -807,7 +807,7 @@ static int sparx5_tc_flower_psfp_setup(struct sparx5 *sparx5,
> /* Add new flow-meter */
> ret = sparx5_psfp_fm_add(sparx5, pol_idx, fm, &psfp_fmid);
> if (ret < 0)
> - return ret;
> + goto err_sg_del;
> }
>
> /* Map stream filter to stream gate */
> @@ -816,7 +816,7 @@ static int sparx5_tc_flower_psfp_setup(struct sparx5 *sparx5,
> /* Add new stream-filter and map it to a steam gate */
> ret = sparx5_psfp_sf_add(sparx5, sf, &psfp_sfid);
> if (ret < 0)
> - return ret;
> + goto err_fm_del;
>
> /* Streams are classified by ISDX - map ISDX 1:1 to sfid for now. */
> sparx5_isdx_conf_set(sparx5, psfp_sfid, psfp_sfid, psfp_fmid);
> @@ -824,13 +824,23 @@ static int sparx5_tc_flower_psfp_setup(struct sparx5 *sparx5,
> ret = vcap_rule_add_action_bit(vrule, VCAP_AF_ISDX_ADD_REPLACE_SEL,
> VCAP_BIT_1);
> if (ret)
> - return ret;
> + goto err_sf_del;
>
> ret = vcap_rule_add_action_u32(vrule, VCAP_AF_ISDX_VAL, psfp_sfid);
> if (ret)
> - return ret;
> + goto err_sf_del;
>
> return 0;
> +
> +err_sf_del:
> + sparx5_isdx_conf_set(sparx5, psfp_sfid, 0, 0);
> + sparx5_psfp_sf_del(sparx5, psfp_sfid);
> +err_fm_del:
> + if (pol_idx >= 0)
> + sparx5_psfp_fm_del(sparx5, psfp_fmid);
> +err_sg_del:
> + sparx5_psfp_sg_del(sparx5, psfp_sgid);
> + return ret;
> }
>
> /* Handle the action trap for a VCAP rule */
next prev parent reply other threads:[~2026-05-27 20:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-27 7:38 [PATCH] net: microchip: sparx5: clean up PSFP resources on flower setup failure Haoxiang Li
2026-05-27 20:54 ` Jacob Keller [this message]
2026-05-29 0:38 ` Jakub Kicinski
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=1af08d75-ecc7-4e8b-abab-dcff2eac5228@intel.com \
--to=jacob.e.keller@intel$(echo .)com \
--cc=Steen.Hegelund@microchip$(echo .)com \
--cc=UNGLinuxDriver@microchip$(echo .)com \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=daniel.machon@microchip$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=lihaoxiang@isrc$(echo .)iscas.ac.cn \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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